1.1.0

Author: codexguy

BaseTests/CodexMicroORM.BaseTests.csproj

@@ -17,9 +17,9 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
- <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
- <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+ <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+ <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
  <PackageReference Include="coverlet.collector" Version="3.1.2">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

BaseTests/DBOps.cs

@@ -9,7 +9,9 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace BaseTests
@@ -31,7 +33,7 @@ public SelfContainedDBOps()
  Globals.WrapperSupports = WrappingSupport.Notifications;
  Globals.WrappingClassNamespace = null;
  Globals.WrapperClassNamePattern = "{0}Wrapped";
- CEF.AddGlobalService(DBService.Create(new MSSQLProcBasedProvider($@"Data Source={DB_SERVER};Database=CodexMicroORMTest;Integrated Security=SSPI;MultipleActiveResultSets=true", defaultSchema: "CEFTest")));
+ CEF.AddGlobalService(DBService.Create(new MSSQLProcBasedProvider($@"Data Source={DB_SERVER};Database=CodexMicroORMTest;Integrated Security=SSPI;MultipleActiveResultSets=true;TrustServerCertificate=true", defaultSchema: "CEFTest")));
  CEF.AddGlobalService(new AuditService());
 
  // New in 0.9.12 - this is probably the exception not the rule, where ordinarily better to assume audit fields *will* be first class props on biz objs; but we support the option to not be
@@ -119,6 +121,10 @@ public SelfContainedDBOps()
  DBService.RegisterOnSaveParentSave<Receipt>("WidgetGroup");
  DBService.RegisterOnSaveParentSave<Shipment>("WidgetGroup");
 
+ // Some properties should not participate in CopySharedTo
+ CEF.RegisterPropertyNameTreatReadOnly(nameof(Person.Kids));
+ CEF.RegisterPropertyNameTreatReadOnly(nameof(Person.Phones));
+
  // Test encryption for memory back cache - will always be different!
  MemoryStream enckeysrc = new MemoryStream();
  enckeysrc.Write(Guid.NewGuid().ToByteArray());
@@ -127,13 +133,13 @@ public SelfContainedDBOps()
  MemoryFileSystemBacked.SetEncryptionKeySource(MemoryFileSystemBacked.SerializationFileEncryptionType.AES256, enckeysrc);
 
  // This will construct a new test database, if needed - if the script changes, you'll need to drop the CodexMicroORMTest database before running
- using (CEF.NewConnectionScope(new ConnectionScopeSettings() { IsTransactional = false, ConnectionStringOverride = $@"Data Source={DB_SERVER};Database=master;Integrated Security=SSPI;MultipleActiveResultSets=true" }))
+ using (CEF.NewConnectionScope(new ConnectionScopeSettings() { IsTransactional = false, ConnectionStringOverride = $@"Data Source={DB_SERVER};Database=master;Integrated Security=SSPI;MultipleActiveResultSets=true;TrustServerCertificate=true" }))
  {
  CEF.CurrentDBService().ExecuteRaw(File.ReadAllText("setup.sql"), false);
  }
 
  // Perform specialized clean-up for tests
- using (CEF.NewConnectionScope(new ConnectionScopeSettings() { IsTransactional = false, ConnectionStringOverride = $@"Data Source={DB_SERVER};Database=CodexMicroORMTest;Integrated Security=SSPI;MultipleActiveResultSets=true" }))
+ using (CEF.NewConnectionScope(new ConnectionScopeSettings() { IsTransactional = false, ConnectionStringOverride = $@"Data Source={DB_SERVER};Database=CodexMicroORMTest;Integrated Security=SSPI;MultipleActiveResultSets=true;TrustServerCertificate=true" }))
  {
  CEF.CurrentDBService().ExecuteRaw("EXEC WTest.[up_Widget_TestCleanup]");
  }
@@ -468,6 +474,44 @@ public void NewWidgetNewReceiptNewShipment()
  // }
  //}
 
+ [TestMethod]
+ public void TestDataTableOps()
+ {
+ using var ss = CEF.NewServiceScope();
+ Globals.UseShadowPropertiesForNew = false;
+
+ EntitySet<Person> people = new();
+ people.Add(new Person() { PersonID = 1, Age = 12, Gender = "F", Name = "Zella" });
+ people.Add(new Person() { PersonID = 2, Age = 13, Gender = "M", Name = "Robert" });
+ people.Add(new Person() { PersonID = 3, Age = 75, Gender = "M", Name = "Jack" });
+ ss.AcceptAllChanges();
+
+ // Let's assume people has been handed back to a client now - it's not dirty. Let's create a data table from it. Try visualizing the dt variable in VS.
+ var dt = people.DeepCopyDataTable();
+ Assert.IsTrue(dt.Rows.Count == 3);
+
+ // Let's make a few changes - an insert, update and a delete using the dt
+ dt.Rows[1]["Age"] = 22;
+ dt.Rows[0].Delete();
+ var nr = dt.NewRow();
+ nr["Age"] = 40;
+ nr["Gender"] = "F";
+ nr["Name"] = "Bobby Tables";
+ dt.Rows.Add(nr);
+
+ // Now let's assume you wanted to package up the change to go to a server... sending it back as entity, not dt
+ EntitySet<Person> peopleCopy = new();
+ dt.DefaultView.ReconcileDataViewToEntitySet(peopleCopy);
+ ss.AcceptAllChanges();
+
+ // Now let's assume we're applying updates, while on the server, back to our data, to get saved... does the row states imply 1 insert, 1 update and 1 delete? it should!
+ peopleCopy.ReconcileEntitySetToEntitySet(people);
+ var debugSS = CEFDebug.ReturnServiceScope();
+ Assert.IsTrue((from a in ss.GetAllTracked() where a.GetRowState() == ObjectState.Modified select a).Count() == 1);
+ Assert.IsTrue((from a in ss.GetAllTracked() where a.GetRowState() == ObjectState.Added select a).Count() == 1);
+ Assert.IsTrue((from a in ss.GetAllTracked() where a.GetRowState() == ObjectState.Deleted select a).Count() == 1);
+ }
+
  [TestMethod]
  public void SingleItemCreateSave()
  {

BaseTests/SandboxTests.cs

@@ -7,9 +7,82 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
+using System.Threading;
 
 namespace BaseTests
 {
+ [TestClass]
+ public class StandaloneTests
+ {
+ [TestMethod]
+ public async Task ExecWithWaitAsync()
+ {
+ StringBuilder sb = new();
+
+ var d = async (CancellationToken ct) =>
+ {
+ sb.Append("point 0;");
+ await Task.Delay(6000);
+ sb.Append("point 1;");
+ ct.ThrowIfCancellationRequested();
+ sb.Append("point 2;");
+ };
+
+ var r1 = await d.ExecuteWithMaxWaitAsync(5000);
+ sb.Append($"result {r1};");
+ sb = new();
+
+ var d2 = async (CancellationToken ct) =>
+ {
+ for (int i = 1; i < 6; ++i)
+ {
+ await Task.Delay(1000, ct);
+ sb.Append($"point2 {i};");
+ }
+ };
+
+ var r2 = await d2.ExecuteWithMaxWaitAsync(5000);
+ sb.Append($"result {r2};");
+ sb = new();
+
+ var d3 = (CancellationToken ct) =>
+ {
+ sb.Append("point3a;");
+ System.Threading.Thread.Sleep(100);
+ sb.Append("point3b;");
+ ct.ThrowIfCancellationRequested();
+ sb.Append("point3c;");
+ };
+
+ var r3 = await d3.ExecuteWithMaxWaitAsync(5000);
+ sb.Append($"result {r3};");
+ sb = new();
+
+ int c = 0;
+
+ var d4 = (CancellationToken ct) =>
+ {
+ sb.Append($"point4 {c};");
+ ++c;
+ ct.ThrowIfCancellationRequested();
+ if (c < 3)
+ {
+ throw new ApplicationException("some issue");
+ }
+ System.Threading.Thread.Sleep(100);
+ ct.ThrowIfCancellationRequested();
+ sb.Append("done;");
+ ct.ThrowIfCancellationRequested();
+ };
+
+ var r4 = await d4.ExecuteWithMaxWaitAsync(10000, true, null, 5);
+ sb.Append($"result {r4};");
+
+ Console.WriteLine(sb.ToString());
+ }
+ }
+
  public class SandboxTests : MarshalByRefObject
  {
  private const string DB_SERVER = @"(local)\sql2016";

CodexMicroORM.Core/Base/CEF.cs

@@ -70,6 +70,10 @@ public static class CEF
  private static readonly object _lockKey = new();
  private static readonly object _lockPCT = new();
 
+ private static readonly ConcurrentDictionary<Type, List<string>> _toSaveProps = new(Globals.DefaultCollectionConcurrencyLevel, Globals.DefaultLargerDictionaryCapacity);
+ private static readonly ConcurrentDictionary<Type, List<string>> _toSavePropsPersist = new(Globals.DefaultCollectionConcurrencyLevel, Globals.DefaultLargerDictionaryCapacity);
+ private static readonly ConcurrentBag<string> _globalPropToSave = new();
+
  #endregion
 
  #region "Public methods"
@@ -504,6 +508,15 @@ public static void AcceptAllChanges()
  CurrentServiceScope.AcceptAllChanges();
  }
 
+ public static IEnumerable<(object item, string? message, int status)> DBSaveTransactional(DBSaveSettings? settings = null)
+ {
+ using var tx = NewTransactionScope();
+ var rv = CurrentServiceScope.DBSave(settings);
+ tx.CanCommit();
+ tx.Dispose();
+ return rv!;
+ }
+
  public static async Task<IEnumerable<(object item, string? message, int status)>> DBSaveTransactionalAsync(DBSaveSettings? settings = null)
  {
  IEnumerable<(object item, string? message, int status)>? rv = null;
@@ -516,6 +529,7 @@ await Task.Run(() =>
  using var tx = NewTransactionScope();
  rv = CurrentServiceScope.DBSave(settings);
  tx.CanCommit();
+ tx.Dispose();
  }
  catch (Exception ex2)
  {
@@ -1112,6 +1126,104 @@ public static ICEFValidationHost CurrentValidationService(object? forObject = nu
 
  #region "Internals"
 
+ private static bool IsPersistable(Type t)
+ {
+ if (t.IsValueType)
+ return true;
+
+ if (t.Equals(typeof(string)))
+ return true;
+
+ if (t.IsPrimitive)
+ return true;
+
+ if (t.IsSerializable)
+ return true;
+
+ return false;
+ }
+
+ internal static List<string> GetToSaveProperties(Type t, bool persisted)
+ {
+ List<string>? list = null;
+
+ if (persisted)
+ {
+ _toSavePropsPersist.TryGetValue(t, out list);
+ }
+ else
+ {
+ _toSaveProps.TryGetValue(t, out list);
+ }
+
+ if (list != null)
+ {
+ return list;
+ }
+
+ // Return all writeable CLR properties, key fields, FK role name fields
+ list = (from a in t.GetProperties() where a.CanWrite && IsPersistable(a.PropertyType) select a.Name)
+ .Union(_globalPropToSave)
+ .Union(from cr in KeyService.ResolveKeyDefinitionForType(t) select cr)
+ .Union((from cr in CEF.CurrentKeyService().GetRelationsForChild(t) select cr.ChildResolvedKey).SelectMany((p) => p))
+ .Union(from cr in CEF.CurrentDBService().GetPropertyGroupFields(t) select cr)
+ .ToList();
+
+ // For non-persisted, we can look 1 level deeper to identify nested props as well - we iterate properties that belong to the same assembly as the root object
+ if (!persisted)
+ {
+ list.AddRange((from a in t.GetProperties()
+ where a.PropertyType.Assembly == t.Assembly
+ select (from b in a.PropertyType.GetProperties()
+ where b.CanWrite && IsPersistable(b.PropertyType)
+ select b.Name)).SelectMany((p) => p));
+ }
+
+ var asvc = CEF.CurrentAuditService();
+
+ if (asvc != null)
+ {
+ if (!string.IsNullOrEmpty(asvc.LastUpdatedByField) && !list.Contains(asvc.LastUpdatedByField))
+ {
+ list.Add(asvc.LastUpdatedByField);
+ }
+
+ if (!string.IsNullOrEmpty(asvc.LastUpdatedDateField) && !list.Contains(asvc.LastUpdatedDateField))
+ {
+ list.Add(asvc.LastUpdatedDateField);
+ }
+ }
+
+ // Support idea of globally excluded properties (i.e. should never persist since might be things like EMailAddressPlain which is just a surrogate for encrypted EMailAddress)
+ var sl = (from a in list where !CEF.RegisteredPropertyNameTreatReadOnly.Contains(a) select a).Distinct().OrderBy((p) => p).ToList();
+
+ if (persisted)
+ {
+ _toSavePropsPersist[t] = sl;
+ }
+ else
+ {
+ _toSaveProps[t] = sl;
+ }
+
+ return sl;
+ }
+
+ internal static IDictionary<string, object?> GetFilteredProperties(Type t, IDictionary<string, object?> props, bool persisted)
+ {
+ Dictionary<string, object?> ret = new(props.Count);
+
+ foreach (var pn in GetToSaveProperties(t, persisted))
+ {
+ if (props.ContainsKey(pn))
+ {
+ ret[pn] = props[pn];
+ }
+ }
+
+ return ret;
+ }
+
  private static Action<bool> InternalSubscribeAppEvents(Action<bool> subscriber)
  {
  lock (_appEventList)

CodexMicroORM.Core/Base/Collections.cs

@@ -157,7 +157,7 @@ public IEnumerable<KeyValuePair<TKey, TValue>> All()
  {
  if (bi != null)
  {
- foreach (var i in bi.Map)
+ foreach (var i in bi.Map.ToArray())
  {
  yield return i;
  }

CodexMicroORM.Core/Base/Exceptions.cs

@@ -180,6 +180,13 @@ public CEFTimeoutException()
  }
  }
 
+ public class CEFInvalidDataException : InvalidOperationException
+ {
+ public CEFInvalidDataException(string msg) : base(msg)
+ {
+ }
+ }
+
  public class CEFValidationException : ApplicationException
  {
  private readonly IEnumerable<(ValidationErrorCode error, string message)>? _messages = null;