Lith 11 місяців тому
батько
коміт
51a41ef3ac

+ 1 - 1
src/Vitorm/StreamQuery/StreamReader.cs

@@ -429,7 +429,7 @@ namespace Vitorm.StreamQuery
         SelectedFields ReadFieldSelect(Argument arg, ExpressionNode_Lambda resultSelector)
         {
             ExpressionNode node = resultSelector.body;
-            if (node?.nodeType != NodeType.New && node?.nodeType != NodeType.Member)
+            if (node?.nodeType != NodeType.New && node?.nodeType != NodeType.Member && node?.nodeType != NodeType.Convert)
                 throw new NotSupportedException($"[StreamReader] unexpected expression nodeType : {node.nodeType}");
 
             bool isDefaultSelect = false;

+ 6 - 6
test/Vitorm.MySql.MsTest/DataSource.cs

@@ -37,12 +37,12 @@ namespace Vitorm.MsTest
             userSet.Create();
 
             var users = new List<User> {
-                    new User {   name="u1", fatherId=4, motherId=6 },
-                    new User {   name="u2", fatherId=4, motherId=6 },
-                    new User {   name="u3", fatherId=5, motherId=6 },
-                    new User {   name="u4" },
-                    new User {   name="u5" },
-                    new User {   name="u6" },
+                    new User {   name="u146", fatherId=4, motherId=6 },
+                    new User {   name="u246", fatherId=4, motherId=6 },
+                    new User {   name="u356", fatherId=5, motherId=6 },
+                    new User {   name="u400" },
+                    new User {   name="u500" },
+                    new User {   name="u600" },
                 };
 
             dbContext.AddRange(users);

+ 6 - 6
test/Vitorm.SqlServer.MsTest/DataSource.cs

@@ -45,12 +45,12 @@ namespace Vitorm.MsTest
             userSet.Create();
 
             var users = new List<User> {
-                    new User {   name="u1", fatherId=4, motherId=6 },
-                    new User {   name="u2", fatherId=4, motherId=6 },
-                    new User {   name="u3", fatherId=5, motherId=6 },
-                    new User {   name="u4" },
-                    new User {   name="u5" },
-                    new User {   name="u6" },
+                    new User {   name="u146", fatherId=4, motherId=6 },
+                    new User {   name="u246", fatherId=4, motherId=6 },
+                    new User {   name="u356", fatherId=5, motherId=6 },
+                    new User {   name="u400" },
+                    new User {   name="u500" },
+                    new User {   name="u600" },
                 };
 
             dbContext.AddRange(users);

+ 0 - 115
test/Vitorm.Sqlite.MsTest/CommonTest/CRUD_Test.cs

@@ -93,75 +93,6 @@ namespace Vitorm.MsTest.CommonTest
         }
 
 
-        [TestMethod]
-        public void Test_ExecuteUpdate()
-        {
-            using var dbContext = DataSource.CreateDbContext();
-            var userQuery = dbContext.Query<User>();
-
-            {
-                var count = userQuery.ExecuteUpdate(row => new User
-                {
-                    name = "u_" + row.id + "_" + (row.fatherId.ToString() ?? "") + "_" + (row.motherId.ToString() ?? ""),
-                    birth = DateTime.Parse("2021-01-11 00:00:00")
-                });
-
-                Assert.AreEqual(6, count);
-
-                var userList = userQuery.ToList();
-                Assert.AreEqual("u_1_4_6", userList.First().name);
-                Assert.AreEqual(DateTime.Parse("2021-01-11 00:00:00"), userList.First().birth);
-                Assert.AreEqual("u_6__", userList.Last().name);
-            }
-
-
-            {
-                var query = from user in userQuery
-                            from father in userQuery.Where(father => user.fatherId == father.id).DefaultIfEmpty()
-                            select new
-                            {
-                                user,
-                                father,
-                                user.motherId
-                            };
-
-                var count = query.ExecuteUpdate(row => new User
-                {
-                    name = "u2_" + row.user.id + "_" + (row.father.id.ToString() ?? "") + "_" + (row.motherId.ToString() ?? "")
-                });
-                Assert.AreEqual(6, count);
-
-
-                var userList = userQuery.ToList();
-                Assert.AreEqual("u2_1_4_6", userList.First().name);
-                Assert.AreEqual("u2_6__", userList.Last().name);
-            }
-
-
-            {
-                var query = from user in userQuery
-                            from father in userQuery.Where(father => user.fatherId == father.id).DefaultIfEmpty()
-                            where user.id <= 5 && father != null
-                            select new
-                            {
-                                user,
-                                father,
-                                user.motherId
-                            };
-
-                var count = query.ExecuteUpdate(row => new User
-                {
-                    name = "u3_" + row.user.id + "_" + (row.father.id.ToString() ?? "") + "_" + (row.motherId.ToString() ?? "")
-                });
-                Assert.AreEqual(3, count);
-
-
-                var userList = userQuery.ToList();
-                Assert.AreEqual("u3_1_4_6", userList[0].name);
-                Assert.AreEqual("u3_3_5_6", userList[2].name);
-                Assert.AreEqual("u2_4__", userList[3].name);
-            }
-        }
         #endregion
 
 
@@ -228,52 +159,6 @@ namespace Vitorm.MsTest.CommonTest
             }
             #endregion
         }
-
-
-
-        [TestMethod]
-        public void Test_ExecuteDelete()
-        {
-            if (1 == 1)
-            {
-                using var dbContext = DataSource.CreateDbContext();
-                var userQuery = dbContext.Query<User>();
-
-                var query = from user in userQuery
-                            from father in userQuery.Where(father => user.fatherId == father.id).DefaultIfEmpty()
-                            where user.id <= 5 && father != null
-                            select new
-                            {
-                                user,
-                                father
-                            };
-
-                var rowCount = query.ExecuteDelete();
-
-                Assert.AreEqual(3, rowCount);
-
-                var newUsers = userQuery.ToList();
-                Assert.AreEqual(3, newUsers.Count());
-                Assert.AreEqual(4, newUsers.First().id);
-                Assert.AreEqual(6, newUsers.Last().id);
-            }
-
-            if (1 == 1)
-            {
-                using var dbContext = DataSource.CreateDbContext();
-                var userQuery = dbContext.Query<User>();
-
-                var rowCount = userQuery.Where(m => m.id == 2 || m.id == 4).ExecuteDelete();
-
-                Assert.AreEqual(2, rowCount);
-
-                var newUsers = userQuery.ToList();
-                Assert.AreEqual(4, newUsers.Count());
-                Assert.AreEqual(1, newUsers.First().id);
-                Assert.AreEqual(3, newUsers[1].id);
-                Assert.AreEqual(5, newUsers[2].id);
-            }
-        }
         #endregion
 
 

+ 56 - 0
test/Vitorm.Sqlite.MsTest/CommonTest/Orm_Extensions_ExecuteDelete_Test.cs

@@ -0,0 +1,56 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Vit.Extensions.Vitorm_Extensions;
+using System.Data;
+
+namespace Vitorm.MsTest.CommonTest
+{
+
+    [TestClass]
+    public class Orm_Extensions_ExecuteDelete_Test
+    {
+
+        [TestMethod]
+        public void Test_ExecuteDelete()
+        {
+            if (1 == 1)
+            {
+                using var dbContext = DataSource.CreateDbContext();
+                var userQuery = dbContext.Query<User>();
+
+                var query = from user in userQuery
+                            from father in userQuery.Where(father => user.fatherId == father.id).DefaultIfEmpty()
+                            where user.id <= 5 && father != null
+                            select new
+                            {
+                                user,
+                                father
+                            };
+
+                var rowCount = query.ExecuteDelete();
+
+                Assert.AreEqual(3, rowCount);
+
+                var newUsers = userQuery.ToList();
+                Assert.AreEqual(3, newUsers.Count());
+                Assert.AreEqual(4, newUsers.First().id);
+                Assert.AreEqual(6, newUsers.Last().id);
+            }
+
+            if (1 == 1)
+            {
+                using var dbContext = DataSource.CreateDbContext();
+                var userQuery = dbContext.Query<User>();
+
+                var rowCount = userQuery.Where(m => m.id == 2 || m.id == 4).ExecuteDelete();
+
+                Assert.AreEqual(2, rowCount);
+
+                var newUsers = userQuery.ToList();
+                Assert.AreEqual(4, newUsers.Count());
+                Assert.AreEqual(1, newUsers.First().id);
+                Assert.AreEqual(3, newUsers[1].id);
+                Assert.AreEqual(5, newUsers[2].id);
+            }
+        }
+    }
+}

+ 82 - 0
test/Vitorm.Sqlite.MsTest/CommonTest/Orm_Extensions_ExecuteUpdate_Test.cs

@@ -0,0 +1,82 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Vit.Extensions.Vitorm_Extensions;
+using System.Data;
+
+namespace Vitorm.MsTest.CommonTest
+{
+
+    [TestClass]
+    public class Orm_Extensions_ExecuteUpdate_Test
+    {
+
+        [TestMethod]
+        public void Test_ExecuteUpdate()
+        {
+            using var dbContext = DataSource.CreateDbContext();
+            var userQuery = dbContext.Query<User>();
+
+            {
+                var count = userQuery.ExecuteUpdate(row => new User
+                {
+                    name = "u_" + row.id + "_" + (row.fatherId.ToString() ?? "") + "_" + (row.motherId.ToString() ?? ""),
+                    birth = DateTime.Parse("2021-01-11 00:00:00")
+                });
+
+                Assert.AreEqual(6, count);
+
+                var userList = userQuery.ToList();
+                Assert.AreEqual("u_1_4_6", userList.First().name);
+                Assert.AreEqual(DateTime.Parse("2021-01-11 00:00:00"), userList.First().birth);
+                Assert.AreEqual("u_6__", userList.Last().name);
+            }
+
+
+            {
+                var query = from user in userQuery
+                            from father in userQuery.Where(father => user.fatherId == father.id).DefaultIfEmpty()
+                            select new
+                            {
+                                user,
+                                father,
+                                user.motherId
+                            };
+
+                var count = query.ExecuteUpdate(row => new User
+                {
+                    name = "u2_" + row.user.id + "_" + (row.father.id.ToString() ?? "") + "_" + (row.motherId.ToString() ?? "")
+                });
+                Assert.AreEqual(6, count);
+
+
+                var userList = userQuery.ToList();
+                Assert.AreEqual("u2_1_4_6", userList.First().name);
+                Assert.AreEqual("u2_6__", userList.Last().name);
+            }
+
+
+            {
+                var query = from user in userQuery
+                            from father in userQuery.Where(father => user.fatherId == father.id).DefaultIfEmpty()
+                            where user.id <= 5 && father != null
+                            select new
+                            {
+                                user,
+                                father,
+                                user.motherId
+                            };
+
+                var count = query.ExecuteUpdate(row => new User
+                {
+                    name = "u3_" + row.user.id + "_" + (row.father.id.ToString() ?? "") + "_" + (row.motherId.ToString() ?? "")
+                });
+                Assert.AreEqual(3, count);
+
+
+                var userList = userQuery.ToList();
+                Assert.AreEqual("u3_1_4_6", userList[0].name);
+                Assert.AreEqual("u3_3_5_6", userList[2].name);
+                Assert.AreEqual("u2_4__", userList[3].name);
+            }
+        }
+    }
+}

+ 46 - 0
test/Vitorm.Sqlite.MsTest/CommonTest/Orm_Extensions_ToExecuteString_Test.cs

@@ -0,0 +1,46 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Vit.Extensions.Vitorm_Extensions;
+using System.Data;
+
+namespace Vitorm.MsTest.CommonTest
+{
+
+    [TestClass]
+    public class Orm_Extensions_ToExecuteString_Test
+    {
+
+        [TestMethod]
+        public void Test_ToExecuteString()
+        {
+            using var dbContext = DataSource.CreateDbContext();
+            var userQuery = dbContext.Query<User>();
+
+            #region users.Where().OrderBy().Skip().Take().ToList
+            /*
+            users.Where(row => row.user.id > 2)
+            .OrderBy(user=>user.id)
+            .Select(row => new {row.user })
+            .Skip(1).Take(2);
+             */
+            {
+                var query = (from user in userQuery
+                             where user.id > 2 && !user.name.Contains("3")
+                             orderby user.id descending
+                             select new
+                             {
+                                 user
+                             })
+                            .Skip(1).Take(2);
+
+                var sql = query.ToExecuteString();
+                Assert.AreEqual(false, string.IsNullOrWhiteSpace(sql));
+
+                var list = query.ToList();
+                Assert.AreEqual(2, list.Count);
+                Assert.AreEqual(5, list[0].user.id);
+            }
+            #endregion
+
+        }
+    }
+}

+ 21 - 0
test/Vitorm.Sqlite.MsTest/CommonTest/Query_LeftJoin_BySelectMany_Test.cs

@@ -196,5 +196,26 @@ namespace Vitorm.MsTest.CommonTest
         }
 
 
+
+        [TestMethod]
+        public void Test_Count()
+        {
+            using var dbContext = DataSource.CreateDbContext();
+            var userQuery = dbContext.Query<User>();
+
+            {
+                var count = (from user in userQuery
+                             from father in userQuery.Where(father => user.fatherId == father.id).DefaultIfEmpty()
+                             where user.id > 2 && father == null
+                             select new
+                             {
+                                 father
+                             }).Count();
+
+                Assert.AreEqual(3, count);
+            }
+        }
+
+
     }
 }

+ 51 - 0
test/Vitorm.Sqlite.MsTest/CommonTest/Query_LinqMethods_Distinct_Test.cs

@@ -0,0 +1,51 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Vit.Extensions.Vitorm_Extensions;
+using System.Data;
+
+namespace Vitorm.MsTest.CommonTest
+{
+
+    [TestClass]
+    public class Query_LinqMethods_Distinct_Test
+    {
+
+        [TestMethod]
+        public void Test_Distinct()
+        {
+            using var dbContext = DataSource.CreateDbContext();
+            var userQuery = dbContext.Query<User>();
+
+            {
+                var query = userQuery.Select(u => new { u.fatherId }).Distinct();
+
+                //var sql = query.ToExecuteString();
+                var userList = query.ToList();
+                var ids = userList.Select(u => u.fatherId).ToList();
+
+                Assert.AreEqual(3, ids.Count);
+                Assert.AreEqual(0, ids.Except(new int?[] { 4, 5, null }).Count());
+            }
+            {
+                var query = userQuery.Select(u => u.fatherId).Distinct();
+
+                //var sql = query.ToExecuteString();
+                var ids = query.ToList();
+
+                Assert.AreEqual(3, ids.Count);
+                Assert.AreEqual(0, ids.Except(new int?[] { 4, 5, null }).Count());
+            }
+            {
+                var query = userQuery.Distinct();
+
+                //var sql = query.ToExecuteString();
+                var userList = query.ToList();
+
+                Assert.AreEqual(6, userList.Count);
+            }
+
+        }
+
+
+
+    }
+}

+ 15 - 52
test/Vitorm.Sqlite.MsTest/CommonTest/Query_LinqMethods_Test.cs

@@ -40,28 +40,24 @@ namespace Vitorm.MsTest.CommonTest
             using var dbContext = DataSource.CreateDbContext();
             var userQuery = dbContext.Query<User>();
 
-            #region SelectMany().Where().OrderBy().Skip().Take().ToExecuteString()
+            #region users.Where().OrderBy().Skip().Take().ToList
             /*
-            users.SelectMany(
-                user => users.Where(father => user.fatherId == father.id).DefaultIfEmpty()
-                , (user, father) => new {user = user, father = father}
-            ).Where(row => row.user.id > 2)
-            .Select(row => new {row.user })
+            users.Where(row => row.user.id > 2)
             .OrderBy(user=>user.id)
+            .Select(row => new {row.user })
             .Skip(1).Take(2);
              */
             {
                 var query = (from user in userQuery
-                             from father in userQuery.Where(father => user.fatherId == father.id).DefaultIfEmpty()
                              where user.id > 2
-                             orderby father.id, user.id descending
+                             orderby user.id descending
                              select new
                              {
                                  user
                              })
                             .Skip(1).Take(2);
 
-                var sql = query.ToExecuteString();
+                //var sql = query.ToExecuteString();
                 var list = query.ToList();
 
                 Assert.AreEqual(2, list.Count);
@@ -97,11 +93,17 @@ namespace Vitorm.MsTest.CommonTest
             var userQuery = dbContext.Query<User>();
 
             {
-                var userList = userQuery.Select(u => u).Where(user => user.id > 2).Where(user => user.id < 4).Select(u => u).ToList();
+                var userList = userQuery.Select(u => u).Where(user => user.id == 3).Select(u => u).ToList();
                 Assert.AreEqual(1, userList.Count);
                 Assert.AreEqual(3, userList.First().id);
             }
 
+            {
+                var userList = userQuery.Where(user => user.id == 3).Select(u => (float)u.id).ToList();
+                Assert.AreEqual(1, userList.Count);
+                Assert.AreEqual(3.0, userList.First());
+            }
+
 
             {
                 var query =
@@ -127,14 +129,13 @@ namespace Vitorm.MsTest.CommonTest
 
             {
                 var count = (from user in userQuery
-                             from father in userQuery.Where(father => user.fatherId == father.id).DefaultIfEmpty()
-                             where user.id > 2 && father == null
+                             where user.id > 2
                              select new
                              {
-                                 father
+                                 user
                              }).Count();
 
-                Assert.AreEqual(3, count);
+                Assert.AreEqual(4, count);
             }
         }
 
@@ -294,44 +295,6 @@ namespace Vitorm.MsTest.CommonTest
 
 
 
-        [TestMethod]
-        public void Test_Distinct()
-        {
-            using var dbContext = DataSource.CreateDbContext();
-            var userQuery = dbContext.Query<User>();
-
-            {
-                var query = userQuery.Select(u => new { u.fatherId }).Distinct();
-
-                var sql = query.ToExecuteString();
-                var userList = query.ToList();
-                var ids = userList.Select(u => u.fatherId).ToList();
-
-                Assert.AreEqual(3, ids.Count);
-                Assert.AreEqual(0, ids.Except(new int?[] { 4, 5, null }).Count());
-            }
-            {
-                var query = userQuery.Select(u => u.fatherId).Distinct();
-
-                var sql = query.ToExecuteString();
-                var ids = query.ToList();
-
-                Assert.AreEqual(3, ids.Count);
-                Assert.AreEqual(0, ids.Except(new int?[] { 4, 5, null }).Count());
-            }
-            {
-                var query = userQuery.Distinct();
-
-                var sql = query.ToExecuteString();
-                var userList = query.ToList();
-
-                Assert.AreEqual(6, userList.Count);
-            }
-
-        }
-
-
-
 
     }
 }

+ 13 - 0
test/Vitorm.Sqlite.MsTest/CommonTest/Query_Type_DateTime_Test.cs

@@ -23,6 +23,19 @@ namespace Vitorm.MsTest.CommonTest
             }
         }
 
+        [TestMethod]
+        public void Test_Compare()
+        {
+            using var dbContext = DataSource.CreateDbContext();
+            var userQuery = dbContext.Query<User>();
+
+            {
+                var userList = userQuery.Where(u => u.birth >= new DateTime(2021, 01, 01, 05, 00, 00)).ToList();
+                Assert.AreEqual(2, userList.Count);
+                Assert.AreEqual(0, userList.Select(m => m.id).Except(new[] { 5, 6 }).Count());
+            }
+
+        }
 
 
         [TestMethod]

+ 3 - 3
test/Vitorm.Sqlite.MsTest/CommonTest/Query_Type_String_Caculate_Test.cs

@@ -17,17 +17,17 @@ namespace Vitorm.MsTest.CommonTest
             var userQuery = dbContext.Query<User>();
 
             {
-                var userList = userQuery.Where(u => u.name + 1 == "u31").ToList();
+                var userList = userQuery.Where(u => u.name + 1 == "u3561").ToList();
                 Assert.AreEqual(1, userList.Count);
                 Assert.AreEqual(3, userList[0].id);
             }
             {
-                var userList = userQuery.Where(u => "u31" == u.name + 1).ToList();
+                var userList = userQuery.Where(u => "u3561" == u.name + 1).ToList();
                 Assert.AreEqual(1, userList.Count);
                 Assert.AreEqual(3, userList[0].id);
             }
             {
-                var userList = userQuery.Where(u => u.name == "u" + 3).ToList();
+                var userList = userQuery.Where(u => u.name == "u35" + 6).ToList();
                 Assert.AreEqual(1, userList.Count);
                 Assert.AreEqual(3, userList[0].id);
             }

+ 9 - 13
test/Vitorm.Sqlite.MsTest/CommonTest/Query_Type_String_Like_Test.cs

@@ -16,36 +16,32 @@ namespace Vitorm.MsTest.CommonTest
             using var dbContext = DataSource.CreateDbContext();
             var userQuery = dbContext.Query<User>();
 
-            var users = userQuery.ToList();
-            users.ForEach(row => row.name = "u|" + row.id + "|" + (row.fatherId.ToString() ?? "") + "|" + (row.motherId.ToString() ?? ""));
-            dbContext.UpdateRange(users);
-
             // StartsWith
             {
-                var query = userQuery.Where(u => u.name.StartsWith("u|3|5"));
-                var sql = query.ToExecuteString();
+                var query = userQuery.Where(u => u.name.StartsWith("u35"));
+                //var sql = query.ToExecuteString();
                 var userList = query.ToList();
                 Assert.AreEqual(1, userList.Count);
                 Assert.AreEqual(3, userList.First().id);
-                Assert.AreEqual("u|3|5|6", userList.First().name);
+                Assert.AreEqual("u356", userList.First().name);
             }
             // EndsWith
             {
-                var query = userQuery.Where(u => u.name.EndsWith("3|5|6"));
-                var sql = query.ToExecuteString();
+                var query = userQuery.Where(u => u.name.EndsWith("356"));
+                //var sql = query.ToExecuteString();
                 var userList = query.ToList();
                 Assert.AreEqual(1, userList.Count);
                 Assert.AreEqual(3, userList.First().id);
-                Assert.AreEqual("u|3|5|6", userList.First().name);
+                Assert.AreEqual("u356", userList.First().name);
             }
             // Contains
             {
-                var query = userQuery.Where(u => u.name.Contains("|3|5|"));
-                var sql = query.ToExecuteString();
+                var query = userQuery.Where(u => u.name.Contains("35"));
+                //var sql = query.ToExecuteString();
                 var userList = query.ToList();
                 Assert.AreEqual(1, userList.Count);
                 Assert.AreEqual(3, userList.First().id);
-                Assert.AreEqual("u|3|5|6", userList.First().name);
+                Assert.AreEqual("u356", userList.First().name);
             }
         }
 

+ 14 - 18
test/Vitorm.Sqlite.MsTest/CommonTest/Query_Type_String_Test.cs

@@ -20,33 +20,33 @@ namespace Vitorm.MsTest.CommonTest
 
             // Enumerable.Contains
             {
-                var userList = userQuery.Where(u => new[] { "u3", "u5" }.Contains(u.name)).ToList();
+                var userList = userQuery.Where(u => new[] { "u356", "u500" }.Contains(u.name)).ToList();
                 Assert.AreEqual(2, userList.Count);
-                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u3", "u5" }).Count());
+                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u356", "u500" }).Count());
             }
 
             // Enumerable.Contains
             {
-                var ids = new[] { "u3", "u5" }.AsEnumerable();
+                var ids = new[] { "u356", "u500" }.AsEnumerable();
                 var userList = userQuery.Where(u => ids.Contains(u.name)).ToList();
                 Assert.AreEqual(2, userList.Count);
-                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u3", "u5" }).Count());
+                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u356", "u500" }).Count());
             }
 
             // Queryable.Contains
             {
-                var ids = new[] { "u3", "u5" }.AsQueryable();
+                var ids = new[] { "u356", "u500" }.AsQueryable();
                 var userList = userQuery.Where(u => ids.Contains(u.name)).ToList();
                 Assert.AreEqual(2, userList.Count);
-                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u3", "u5" }).Count());
+                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u356", "u500" }).Count());
             }
 
 
             // not Contains
             {
-                var userList = userQuery.Where(u => !new[] { "u3", "u5" }.Contains(u.name)).ToList();
+                var userList = userQuery.Where(u => !new[] { "u356", "u500" }.Contains(u.name)).ToList();
                 Assert.AreEqual(4, userList.Count);
-                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u1", "u2", "u4", "u6" }).Count());
+                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u146", "u246", "u400", "u600" }).Count());
             }
         }
 
@@ -59,21 +59,21 @@ namespace Vitorm.MsTest.CommonTest
 
             // #1 ==
             {
-                var userList = userQuery.Where(u => u.name == "u3" || "u5" == u.name).ToList();
+                var userList = userQuery.Where(u => u.name == "u356" || "u500" == u.name).ToList();
                 Assert.AreEqual(2, userList.Count);
-                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u3", "u5" }).Count());
+                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u356", "u500" }).Count());
             }
 
             // #2 !=
             {
-                var userList = userQuery.Where(u => u.name != "u1").ToList();
+                var userList = userQuery.Where(u => u.name != "u146").ToList();
                 Assert.AreEqual(5, userList.Count);
-                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u2", "u3", "u4", "u5", "u6" }).Count());
+                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u246", "u356", "u400", "u500", "u600" }).Count());
             }
             {
-                var userList = userQuery.Where(u => "u1" != u.name).ToList();
+                var userList = userQuery.Where(u => "u146" != u.name).ToList();
                 Assert.AreEqual(5, userList.Count);
-                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u2", "u3", "u4", "u5", "u6" }).Count());
+                Assert.AreEqual(0, userList.Select(m => m.name).Except(new[] { "u246", "u356", "u400", "u500", "u600" }).Count());
             }
         }
 
@@ -82,9 +82,5 @@ namespace Vitorm.MsTest.CommonTest
 
 
 
-
-
-
-
     }
 }

+ 32 - 32
test/Vitorm.Sqlite.MsTest/CommonTest/Transaction_Test.cs

@@ -15,33 +15,33 @@ namespace Vitorm.MsTest.CommonTest
                 using var dbContext = DataSource.CreateDbContext();
                 var userSet = dbContext.DbSet<User>();
 
-                Assert.AreEqual("u4", userSet.Get(4).name);
+                Assert.AreEqual("u400", userSet.Get(4).name);
 
-                dbContext.Update(new User { id = 4, name = "u41" });
-                Assert.AreEqual("u41", userSet.Get(4).name);
+                dbContext.Update(new User { id = 4, name = "u4001" });
+                Assert.AreEqual("u4001", userSet.Get(4).name);
 
                 using (var tran = dbContext.BeginTransaction())
                 {
-                    dbContext.Update(new User { id = 4, name = "u42" });
-                    Assert.AreEqual("u42", userSet.Get(4).name);
+                    dbContext.Update(new User { id = 4, name = "u4002" });
+                    Assert.AreEqual("u4002", userSet.Get(4).name);
                 }
-                Assert.AreEqual("u41", userSet.Get(4).name);
+                Assert.AreEqual("u4001", userSet.Get(4).name);
 
                 using (var tran = dbContext.BeginTransaction())
                 {
-                    dbContext.Update(new User { id = 4, name = "u42" });
-                    Assert.AreEqual("u42", userSet.Get(4).name);
+                    dbContext.Update(new User { id = 4, name = "u4002" });
+                    Assert.AreEqual("u4002", userSet.Get(4).name);
                     tran.Rollback();
                 }
-                Assert.AreEqual("u41", userSet.Get(4).name);
+                Assert.AreEqual("u4001", userSet.Get(4).name);
 
                 using (var tran = dbContext.BeginTransaction())
                 {
-                    dbContext.Update(new User { id = 4, name = "u43" });
-                    Assert.AreEqual("u43", userSet.Get(4).name);
+                    dbContext.Update(new User { id = 4, name = "u4003" });
+                    Assert.AreEqual("u4003", userSet.Get(4).name);
                     tran.Commit();
                 }
-                Assert.AreEqual("u43", userSet.Get(4).name);
+                Assert.AreEqual("u4003", userSet.Get(4).name);
 
             }
             #endregion
@@ -58,25 +58,25 @@ namespace Vitorm.MsTest.CommonTest
 
                 var tran2 = dbContext.BeginTransaction();
                 {
-                    dbContext.Update(new User { id = 4, name = "u42" });
-                    Assert.AreEqual("u42", userSet.Get(4).name);
+                    dbContext.Update(new User { id = 4, name = "u4002" });
+                    Assert.AreEqual("u4002", userSet.Get(4).name);
                     tran2.Commit();
                 }
 
-                Assert.AreEqual("u42", userSet.Get(4).name);
+                Assert.AreEqual("u4002", userSet.Get(4).name);
 
                 var tran3 = dbContext.BeginTransaction();
                 {
-                    dbContext.Update(new User { id = 4, name = "u43" });
-                    Assert.AreEqual("u43", userSet.Get(4).name);
+                    dbContext.Update(new User { id = 4, name = "u4003" });
+                    Assert.AreEqual("u4003", userSet.Get(4).name);
                 }
-                Assert.AreEqual("u43", userSet.Get(4).name);
+                Assert.AreEqual("u4003", userSet.Get(4).name);
             }
             {
                 using var dbContext = DataSource.CreateDbContext();
                 var userSet = dbContext.DbSet<User>();
 
-                //Assert.AreEqual("u42", userSet.Get(4).name);
+                //Assert.AreEqual("u4002", userSet.Get(4).name);
             }
 
         }
@@ -89,38 +89,38 @@ namespace Vitorm.MsTest.CommonTest
                 using var dbContext = DataSource.CreateDbContext();
                 var userSet = dbContext.DbSet<User>();
 
-                Assert.AreEqual("u4", userSet.Get(4).name);
+                Assert.AreEqual("u400", userSet.Get(4).name);
 
                 using (var tran1 = dbContext.BeginTransaction())
                 {
-                    dbContext.Update(new User { id = 4, name = "u41" });
-                    Assert.AreEqual("u41", userSet.Get(4).name);
+                    dbContext.Update(new User { id = 4, name = "u4001" });
+                    Assert.AreEqual("u4001", userSet.Get(4).name);
 
                     using (var tran2 = dbContext.BeginTransaction())
                     {
-                        dbContext.Update(new User { id = 4, name = "u42" });
-                        Assert.AreEqual("u42", userSet.Get(4).name);
+                        dbContext.Update(new User { id = 4, name = "u4002" });
+                        Assert.AreEqual("u4002", userSet.Get(4).name);
                     }
-                    Assert.AreEqual("u41", userSet.Get(4).name);
+                    Assert.AreEqual("u4001", userSet.Get(4).name);
 
                     using (var tran2 = dbContext.BeginTransaction())
                     {
-                        dbContext.Update(new User { id = 4, name = "u42" });
-                        Assert.AreEqual("u42", userSet.Get(4).name);
+                        dbContext.Update(new User { id = 4, name = "u4002" });
+                        Assert.AreEqual("u4002", userSet.Get(4).name);
                         tran2.Rollback();
                     }
-                    Assert.AreEqual("u41", userSet.Get(4).name);
+                    Assert.AreEqual("u4001", userSet.Get(4).name);
 
                     using (var tran2 = dbContext.BeginTransaction())
                     {
-                        dbContext.Update(new User { id = 4, name = "u43" });
-                        Assert.AreEqual("u43", userSet.Get(4).name);
+                        dbContext.Update(new User { id = 4, name = "u4003" });
+                        Assert.AreEqual("u4003", userSet.Get(4).name);
                         tran2.Commit();
                     }
-                    Assert.AreEqual("u43", userSet.Get(4).name);
+                    Assert.AreEqual("u4003", userSet.Get(4).name);
                 }
 
-                Assert.AreEqual("u4", userSet.Get(4).name);
+                Assert.AreEqual("u400", userSet.Get(4).name);
             }
             #endregion
         }

+ 6 - 6
test/Vitorm.Sqlite.MsTest/DataSource.cs

@@ -37,12 +37,12 @@ namespace Vitorm.MsTest
             userSet.Create();
 
             var users = new List<User> {
-                    new User { id=1, name="u1", fatherId=4, motherId=6 },
-                    new User { id=2, name="u2", fatherId=4, motherId=6 },
-                    new User { id=3, name="u3", fatherId=5, motherId=6 },
-                    new User { id=4, name="u4" },
-                    new User { id=5, name="u5" },
-                    new User { id=6, name="u6" },
+                    new User { id=1, name="u146", fatherId=4, motherId=6 },
+                    new User { id=2, name="u246", fatherId=4, motherId=6 },
+                    new User { id=3, name="u356", fatherId=5, motherId=6 },
+                    new User { id=4, name="u400" },
+                    new User { id=5, name="u500" },
+                    new User { id=6, name="u600" },
                 };
             users.ForEach(user => { user.birth = DateTime.Parse("2021-01-01 00:00:00").AddHours(user.id); });