mirror of
				https://github.com/nsnail/FreeSql.git
				synced 2025-11-04 09:15:27 +08:00 
			
		
		
		
	- 修复 未发布功能WhereObject/WhereItems 单条参数化;- 恢复 Repository.DataFilter Enable/Disable 功能;
This commit is contained in:
		@@ -577,9 +577,9 @@ namespace base_entity
 | 
			
		||||
                //.UseConnectionString(FreeSql.DataType.Firebird, @"database=localhost:D:\fbdata\EXAMPLES.fdb;user=sysdba;password=123456;max pool size=5")
 | 
			
		||||
                //.UseQuoteSqlName(false)
 | 
			
		||||
 | 
			
		||||
                .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;min pool size=1;Max pool size=3;AllowLoadLocalInfile=true")
 | 
			
		||||
                //.UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;min pool size=1;Max pool size=3;AllowLoadLocalInfile=true")
 | 
			
		||||
 | 
			
		||||
				//.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
 | 
			
		||||
				.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=3;TrustServerCertificate=true")
 | 
			
		||||
				//.UseAdoConnectionPool(false)
 | 
			
		||||
				//.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=127.0.0.1;Port=5432;Username=postgres;Password=123456;Database=tedb;Pooling=true;Maximum Pool Size=2")
 | 
			
		||||
				////.UseConnectionString(FreeSql.DataType.PostgreSQL, "Host=127.0.0.1;Port=5432;Username=postgres;Password=123456;Database=toc;Pooling=true;Maximum Pool Size=2")
 | 
			
		||||
@@ -620,6 +620,51 @@ namespace base_entity
 | 
			
		||||
            #endregion
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
            var usergroupRepository = fsql.GetAggregateRootRepository<UserGroup>();
 | 
			
		||||
            usergroupRepository.Delete(a => true);
 | 
			
		||||
            usergroupRepository.Insert(new[]{
 | 
			
		||||
                new UserGroup
 | 
			
		||||
                {
 | 
			
		||||
                    CreateTime = DateTime.Now,
 | 
			
		||||
                    GroupName = "group1",
 | 
			
		||||
                    UpdateTime = DateTime.Now,
 | 
			
		||||
                    Sort = 1,
 | 
			
		||||
                    User1s = new List<User1>
 | 
			
		||||
                    {
 | 
			
		||||
                        new User1 { Nickname = "nickname11", Username = "username11", Description = "desc11" },
 | 
			
		||||
                        new User1 { Nickname = "nickname12", Username = "username12", Description = "desc12" },
 | 
			
		||||
                        new User1 { Nickname = "nickname13", Username = "username13", Description = "desc13" },
 | 
			
		||||
                    }
 | 
			
		||||
                },
 | 
			
		||||
                new UserGroup
 | 
			
		||||
                {
 | 
			
		||||
                    CreateTime = DateTime.Now,
 | 
			
		||||
                    GroupName = "group2",
 | 
			
		||||
                    UpdateTime = DateTime.Now,
 | 
			
		||||
                    Sort = 2,
 | 
			
		||||
                    User1s = new List<User1>
 | 
			
		||||
                    {
 | 
			
		||||
                        new User1 { Nickname = "nickname21", Username = "username21", Description = "desc21" },
 | 
			
		||||
                        new User1 { Nickname = "nickname22", Username = "username22", Description = "desc22" },
 | 
			
		||||
                        new User1 { Nickname = "nickname23", Username = "username23", Description = "desc23" },
 | 
			
		||||
                    }
 | 
			
		||||
                },
 | 
			
		||||
            });
 | 
			
		||||
            var ugroupFirst = usergroupRepository.Select.First();
 | 
			
		||||
            ugroupFirst.Sort++;
 | 
			
		||||
            usergroupRepository.Update(ugroupFirst);
 | 
			
		||||
            var userRepository = fsql.GetAggregateRootRepository<User1>();
 | 
			
		||||
 | 
			
		||||
            var testsublist1 = fsql.Select<UserGroup>()
 | 
			
		||||
                .First(a => new
 | 
			
		||||
                {
 | 
			
		||||
                    a.Id,
 | 
			
		||||
                    list = userRepository.Select.Where(b => b.GroupId == a.Id).ToList(),
 | 
			
		||||
                    list2 = userRepository.Select.Where(b => b.GroupId == a.Id).ToList(b => b.Nickname),
 | 
			
		||||
                });
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
            FreeSql.Internal.Utils.TypeHandlers.TryAdd(typeof(DateTimeOffset), new DateTimeOffsetTypeHandler());
 | 
			
		||||
 | 
			
		||||
            fsql.Insert(new Account { Name = DateTime.Now.ToString(), Join = DateTimeOffset.Now }).ExecuteAffrows();
 | 
			
		||||
@@ -1297,48 +1342,6 @@ var sql11111 = fsql.Select<Class1111>()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
            var usergroupRepository = fsql.GetAggregateRootRepository<UserGroup>();
 | 
			
		||||
            usergroupRepository.Delete(a => true);
 | 
			
		||||
            usergroupRepository.Insert(new[]{
 | 
			
		||||
                new UserGroup
 | 
			
		||||
                {
 | 
			
		||||
                    CreateTime = DateTime.Now,
 | 
			
		||||
                    GroupName = "group1",
 | 
			
		||||
                    UpdateTime = DateTime.Now,
 | 
			
		||||
                    Sort = 1,
 | 
			
		||||
                    User1s = new List<User1>
 | 
			
		||||
                    {
 | 
			
		||||
                        new User1 { Nickname = "nickname11", Username = "username11", Description = "desc11" },
 | 
			
		||||
                        new User1 { Nickname = "nickname12", Username = "username12", Description = "desc12" },
 | 
			
		||||
                        new User1 { Nickname = "nickname13", Username = "username13", Description = "desc13" },
 | 
			
		||||
                    }
 | 
			
		||||
                },
 | 
			
		||||
                new UserGroup
 | 
			
		||||
                {
 | 
			
		||||
                    CreateTime = DateTime.Now,
 | 
			
		||||
                    GroupName = "group2",
 | 
			
		||||
                    UpdateTime = DateTime.Now,
 | 
			
		||||
                    Sort = 2,
 | 
			
		||||
                    User1s = new List<User1>
 | 
			
		||||
                    {
 | 
			
		||||
                        new User1 { Nickname = "nickname21", Username = "username21", Description = "desc21" },
 | 
			
		||||
                        new User1 { Nickname = "nickname22", Username = "username22", Description = "desc22" },
 | 
			
		||||
                        new User1 { Nickname = "nickname23", Username = "username23", Description = "desc23" },
 | 
			
		||||
                    }
 | 
			
		||||
                },
 | 
			
		||||
            });
 | 
			
		||||
            var ugroupFirst = usergroupRepository.Select.First();
 | 
			
		||||
            ugroupFirst.Sort++;
 | 
			
		||||
            usergroupRepository.Update(ugroupFirst);
 | 
			
		||||
            var userRepository = fsql.GetAggregateRootRepository<User1>();
 | 
			
		||||
 | 
			
		||||
            var testsublist1 = fsql.Select<UserGroup>()
 | 
			
		||||
                .First(a => new
 | 
			
		||||
                {
 | 
			
		||||
                    a.Id,
 | 
			
		||||
                    list = userRepository.Select.Where(b => b.GroupId == a.Id).ToList(),
 | 
			
		||||
                    list2 = userRepository.Select.Where(b => b.GroupId == a.Id).ToList(b => b.Nickname),
 | 
			
		||||
                });
 | 
			
		||||
 | 
			
		||||
            //fsql.CodeFirst.GetTableByEntity(typeof(User1)).Columns.Values.ToList().ForEach(col =>
 | 
			
		||||
            //{
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user