diff --git a/Extensions/FreeSql.Extensions.LazyLoading/LazyLoadingComplier.cs b/Extensions/FreeSql.Extensions.LazyLoading/LazyLoadingComplier.cs index 0c8017fc..75dfb248 100644 --- a/Extensions/FreeSql.Extensions.LazyLoading/LazyLoadingComplier.cs +++ b/Extensions/FreeSql.Extensions.LazyLoading/LazyLoadingComplier.cs @@ -12,15 +12,8 @@ namespace FreeSql.Extensions.LazyLoading #if ns20 internal static Lazy _compiler = new Lazy(() => { - //var dlls = Directory.GetFiles(Directory.GetParent(Type.GetType("IFreeSql, FreeSql").Assembly.Location).FullName, "*.dll;*.exe"); var compiler = new CSScriptLib.RoslynEvaluator(); compiler.DisableReferencingFromCode = false; - //compiler.DebugBuild = true; - //foreach (var dll in dlls) { - // Console.WriteLine(dll); - // var ass = Assembly.LoadFile(dll); - // compiler.ReferenceAssembly(ass); - //} compiler .ReferenceAssemblyOf() .ReferenceDomainAssemblies(); diff --git a/FreeSql.Tests/FreeSql.Tests/DataAnnotations/MySqlFluentTest.cs b/FreeSql.Tests/FreeSql.Tests/DataAnnotations/MySqlFluentTest.cs index efeca38c..c4110f04 100644 --- a/FreeSql.Tests/FreeSql.Tests/DataAnnotations/MySqlFluentTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/DataAnnotations/MySqlFluentTest.cs @@ -133,6 +133,33 @@ namespace FreeSql.Tests.DataAnnotations public bool isignore { get; set; } } + [Fact] + public void AutoPrimary() + { + var tb1 = g.mysql.CodeFirst.GetTableByEntity(typeof(pkfalse_t1)); + var tb2 = g.mysql.CodeFirst.GetTableByEntity(typeof(pkfalse_t2)); + var tb3 = g.mysql.CodeFirst.GetTableByEntity(typeof(pkfalse_t3)); + + Assert.True(tb1.ColumnsByCs["id"].Attribute.IsPrimary); + Assert.False(tb2.ColumnsByCs["id"].Attribute.IsPrimary); + Assert.True(tb3.ColumnsByCs["id"].Attribute.IsPrimary); + } + + class pkfalse_t1 + { + public int id { get; set; } + } + class pkfalse_t2 + { + [Column(IsPrimary = false)] + public int id { get; set; } + } + class pkfalse_t3 + { + [Column(IsPrimary = true)] + public int id { get; set; } + } + [Fact] public void CanInsert_CanUpdate() { diff --git a/FreeSql.Tests/FreeSql.Tests/DataAnnotations/SqlServerFluentTest.cs b/FreeSql.Tests/FreeSql.Tests/DataAnnotations/SqlServerFluentTest.cs index 77e54ddb..e3eaf1f7 100644 --- a/FreeSql.Tests/FreeSql.Tests/DataAnnotations/SqlServerFluentTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/DataAnnotations/SqlServerFluentTest.cs @@ -128,6 +128,33 @@ namespace FreeSql.Tests.DataAnnotations [Column(IsIgnore = true)] public bool isignore { get; set; } } + + [Fact] + public void AutoPrimary() + { + var tb1 = g.sqlserver.CodeFirst.GetTableByEntity(typeof(pkfalse_t1)); + var tb2 = g.sqlserver.CodeFirst.GetTableByEntity(typeof(pkfalse_t2)); + var tb3 = g.sqlserver.CodeFirst.GetTableByEntity(typeof(pkfalse_t3)); + + Assert.True(tb1.ColumnsByCs["id"].Attribute.IsPrimary); + Assert.False(tb2.ColumnsByCs["id"].Attribute.IsPrimary); + Assert.True(tb3.ColumnsByCs["id"].Attribute.IsPrimary); + } + + class pkfalse_t1 + { + public int id { get; set; } + } + class pkfalse_t2 + { + [Column(IsPrimary = false)] + public int id { get; set; } + } + class pkfalse_t3 + { + [Column(IsPrimary = true)] + public int id { get; set; } + } } } diff --git a/FreeSql.Tests/FreeSql.Tests/UnitTest3.cs b/FreeSql.Tests/FreeSql.Tests/UnitTest3.cs index 6c86a36d..0fba1c0e 100644 --- a/FreeSql.Tests/FreeSql.Tests/UnitTest3.cs +++ b/FreeSql.Tests/FreeSql.Tests/UnitTest3.cs @@ -43,21 +43,6 @@ namespace FreeSql.Tests // fsql.Select().ToList(); //} - var tb1 = g.sqlite.CodeFirst.GetTableByEntity(typeof(pkfalse_t1)); - - var tb2 = g.sqlite.CodeFirst.GetTableByEntity(typeof(pkfalse_t2)); - } - - class pkfalse_t1 - { - [Column(IsPrimary = false)] - public int id { get; set; } - } - - class pkfalse_t2 - { - [Column(IsPrimary = true)] - public int id { get; set; } } class ut3_t1 @@ -66,7 +51,6 @@ namespace FreeSql.Tests public int id { get; set; } public string name { get; set; } } - class ut3_t2 { [Column(IsIdentity = true)] diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml index ca0c17f1..97eb81b3 100644 --- a/FreeSql/FreeSql.xml +++ b/FreeSql/FreeSql.xml @@ -2146,6 +2146,137 @@ + + + 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】 + + + + + + + + + 查询，ExecuteReaderAsync(dr => {}, "select * from user where age > @age", new { age = 25 }) + + + + + + + 查询 + + + + + + + 查询，ExecuteArrayAsync("select * from user where age > @age", new { age = 25 }) + + + + + + + + 查询 + + + + + + + 查询，ExecuteDataSetAsync("select * from user where age > @age; select 2", new { age = 25 }) + + + + + + + + 查询 + + + + + + + 查询，ExecuteDataTableAsync("select * from user where age > @age", new { age = 25 }) + + + + + + + + 在【主库】执行 + + + + + + + + 在【主库】执行，ExecuteNonQueryAsync("delete from user where age > @age", new { age = 25 }) + + + + + + + + 在【主库】执行 + + + + + + + + 在【主库】执行，ExecuteScalarAsync("select 1 from user where age > @age", new { age = 25 }) + + + + + + + + 执行SQL返回对象集合，QueryAsync<User>("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 }) + + + + + + + + + + 执行SQL返回对象集合，QueryAsync<User>("select * from user where age > @age", new { age = 25 }) + + + + + + + + + 执行SQL返回对象集合，Query<User>("select * from user where age > @age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 }) + + + + + + + + + + 执行SQL返回对象集合，Query<User>("select * from user where age > @age; select * from address", new { age = 25 }) + + + + + + 可自定义解析表达式 @@ -2924,160 +3055,3 @@ -unc{``0,System.Boolean}},System.Boolean,System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})"> - - 使用 or 拼接两个 lambda 表达式 - - - - true 时生效 - - - - - - 将 lambda 表达式取反 - - - - true 时生效 - - - - - 生成类似Mongodb的ObjectId有序、不重复Guid - - - - - - 插入数据 - - - - - - - 插入数据，传入实体 - - - - - - - - 插入数据，传入实体数组 - - - - - - - - 插入数据，传入实体集合 - - - - - - - - 插入数据，传入实体集合 - - - - - - - - 修改数据 - - - - - - - 修改数据，传入动态对象如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1} - - - 主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合 - - - - - 查询数据 - - - - - - - 查询数据，传入动态对象如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1} - - - 主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合 - - - - - 删除数据 - - - - - - - 删除数据，传入动态对象如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1} - - - 主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合 - - - - - 开启事务（不支持异步），60秒未执行完成（可能）被其他线程事务自动提交 - - 事务体 () => {} - - - - 开启事务（不支持异步） - - 超时，未执行完成（可能）被其他线程事务自动提交 - 事务体 () => {} - - - - 开启事务（不支持异步） - - - 事务体 () => {} - 超时，未执行完成（可能）被其他线程事务自动提交 - - - - 数据库访问对象 - - - - - 所有拦截方法都在这里 - - - - - CodeFirst 模式开发相关方法 - - - - - DbFirst 模式开发相关方法 - - - - - 全局过滤设置，可默认附加为 Select/Update/Delete 条件 - - - - diff --git a/FreeSql/Interface/Curd/ISelect/ISelect10.cs b/FreeSql/Interface/Curd/ISelect/ISelect10.cs index c370667b..57faf043 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect10.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect10.cs @@ -12,12 +12,15 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); - Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); + + Task ToOneAsync(Expression> select); + Task FirstAsync(Expression> select); + Task FirstAsync(); + Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); - Task SumAsync(Expression> column); Task MinAsync(Expression> column); Task MaxAsync(Expression> column); @@ -28,6 +31,11 @@ namespace FreeSql DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); + + TReturn ToOne(Expression> select); + TReturn First(Expression> select); + TDto First(); + string ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex); TReturn ToAggregate(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); decimal Sum(Expression> column); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect2.cs b/FreeSql/Interface/Curd/ISelect/ISelect2.cs index c419870b..ccb2d1c6 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect2.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect2.cs @@ -12,12 +12,15 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); - Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); - Task ToAggregateAsync(Expression, ISelectGroupingAggregate, TReturn>> select); + Task ToOneAsync(Expression> select); + Task FirstAsync(Expression> select); + Task FirstAsync(); + + Task ToAggregateAsync(Expression, ISelectGroupingAggregate, TReturn>> select); Task SumAsync(Expression> column); Task MinAsync(Expression> column); Task MaxAsync(Expression> column); @@ -26,8 +29,13 @@ namespace FreeSql bool Any(Expression> exp); DataTable ToDataTable(Expression> select); - List ToList(Expression> select); + List ToList(Expression> select); List ToList(); + + TReturn ToOne(Expression> select); + TReturn First(Expression> select); + TDto First(); + string ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex); TReturn ToAggregate(Expression, ISelectGroupingAggregate, TReturn>> select); decimal Sum(Expression> column); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect3.cs b/FreeSql/Interface/Curd/ISelect/ISelect3.cs index d53693c1..eac99d36 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect3.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect3.cs @@ -12,12 +12,15 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); - Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); - Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); + Task ToOneAsync(Expression> select); + Task FirstAsync(Expression> select); + Task FirstAsync(); + + Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); Task SumAsync(Expression> column); Task MinAsync(Expression> column); Task MaxAsync(Expression> column); @@ -28,6 +31,11 @@ namespace FreeSql DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); + + TReturn ToOne(Expression> select); + TReturn First(Expression> select); + TDto First(); + string ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex); TReturn ToAggregate(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); decimal Sum(Expression> column); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect4.cs b/FreeSql/Interface/Curd/ISelect/ISelect4.cs index b60dfc14..ca180e47 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect4.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect4.cs @@ -12,12 +12,15 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); - Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); - Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); + Task ToOneAsync(Expression> select); + Task FirstAsync(Expression> select); + Task FirstAsync(); + + Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); Task SumAsync(Expression> column); Task MinAsync(Expression> column); Task MaxAsync(Expression> column); @@ -28,6 +31,11 @@ namespace FreeSql DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); + + TReturn ToOne(Expression> select); + TReturn First(Expression> select); + TDto First(); + string ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex); TReturn ToAggregate(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); decimal Sum(Expression> column); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect5.cs b/FreeSql/Interface/Curd/ISelect/ISelect5.cs index f4c340be..a870eeed 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect5.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect5.cs @@ -12,12 +12,15 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); - Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); - Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); + Task ToOneAsync(Expression> select); + Task FirstAsync(Expression> select); + Task FirstAsync(); + + Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); Task SumAsync(Expression> column); Task MinAsync(Expression> column); Task MaxAsync(Expression> column); @@ -28,6 +31,11 @@ namespace FreeSql DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); + + TReturn ToOne(Expression> select); + TReturn First(Expression> select); + TDto First(); + string ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex); TReturn ToAggregate(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); decimal Sum(Expression> column); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect6.cs b/FreeSql/Interface/Curd/ISelect/ISelect6.cs index 8a6db616..08cdd495 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect6.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect6.cs @@ -12,12 +12,15 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); - Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); - Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); + Task ToOneAsync(Expression> select); + Task FirstAsync(Expression> select); + Task FirstAsync(); + + Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); Task SumAsync(Expression> column); Task MinAsync(Expression> column); Task MaxAsync(Expression> column); @@ -28,6 +31,11 @@ namespace FreeSql DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); + + TReturn ToOne(Expression> select); + TReturn First(Expression> select); + TDto First(); + string ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex); TReturn ToAggregate(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); decimal Sum(Expression> column); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect7.cs b/FreeSql/Interface/Curd/ISelect/ISelect7.cs index 62a0d528..88f81f92 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect7.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect7.cs @@ -12,12 +12,15 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); - Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); - Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); + Task ToOneAsync(Expression> select); + Task FirstAsync(Expression> select); + Task FirstAsync(); + + Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); Task SumAsync(Expression> column); Task MinAsync(Expression> column); Task MaxAsync(Expression> column); @@ -28,6 +31,11 @@ namespace FreeSql DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); + + TReturn ToOne(Expression> select); + TReturn First(Expression> select); + TDto First(); + string ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex); TReturn ToAggregate(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); decimal Sum(Expression> column); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect8.cs b/FreeSql/Interface/Curd/ISelect/ISelect8.cs index 18d4c318..92492ef6 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect8.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect8.cs @@ -12,12 +12,15 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); - Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); - Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); + Task ToOneAsync(Expression> select); + Task FirstAsync(Expression> select); + Task FirstAsync(); + + Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); Task SumAsync(Expression> column); Task MinAsync(Expression> column); Task MaxAsync(Expression> column); @@ -28,6 +31,11 @@ namespace FreeSql DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); + + TReturn ToOne(Expression> select); + TReturn First(Expression> select); + TDto First(); + string ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex); TReturn ToAggregate(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); decimal Sum(Expression> column); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect9.cs b/FreeSql/Interface/Curd/ISelect/ISelect9.cs index f8974d0b..21d92c7a 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect9.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect9.cs @@ -12,12 +12,15 @@ namespace FreeSql #if net40 #else Task AnyAsync(Expression> exp); - Task ToDataTableAsync(Expression> select); Task> ToListAsync(Expression> select); Task> ToListAsync(); - Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); + Task ToOneAsync(Expression> select); + Task FirstAsync(Expression> select); + Task FirstAsync(); + + Task ToAggregateAsync(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); Task SumAsync(Expression> column); Task MinAsync(Expression> column); Task MaxAsync(Expression> column); @@ -28,6 +31,11 @@ namespace FreeSql DataTable ToDataTable(Expression> select); List ToList(Expression> select); List ToList(); + + TReturn ToOne(Expression> select); + TReturn First(Expression> select); + TDto First(); + string ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex); TReturn ToAggregate(Expression, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, ISelectGroupingAggregate, TReturn>> select); decimal Sum(Expression> column); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs index 892b45d6..fd73c7c0 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; @@ -121,7 +122,7 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } - string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex) + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; @@ -170,6 +171,10 @@ namespace FreeSql.Internal.CommonProvider return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).Any(); } + TReturn ISelect.ToOne(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TReturn ISelect.First(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TDto ISelect.First() => (this as ISelect).ToList().FirstOrDefault(); + #if net40 #else Task ISelect.AvgAsync(Expression> column) @@ -228,6 +233,11 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).AnyAsync(); } + + async Task ISelect.ToOneAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync() => (await (this as ISelect).ToListAsync()).FirstOrDefault(); + #endif } } \ No newline at end of file diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs index 40ed5cb9..beaa1d50 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; @@ -98,7 +99,7 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } - string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex) + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; @@ -147,6 +148,10 @@ namespace FreeSql.Internal.CommonProvider return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).Any(); } + TReturn ISelect.ToOne(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TReturn ISelect.First(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TDto ISelect.First() => (this as ISelect).ToList().FirstOrDefault(); + #if net40 #else Task ISelect.AvgAsync(Expression> column) @@ -205,6 +210,11 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).AnyAsync(); } + + async Task ISelect.ToOneAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync() => (await (this as ISelect).ToListAsync()).FirstOrDefault(); + #endif } } \ No newline at end of file diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs index 31f842a7..5f49d8cf 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; @@ -101,7 +102,7 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } - string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex) + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; @@ -150,6 +151,10 @@ namespace FreeSql.Internal.CommonProvider return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).Any(); } + TReturn ISelect.ToOne(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TReturn ISelect.First(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TDto ISelect.First() => (this as ISelect).ToList().FirstOrDefault(); + #if net40 #else Task ISelect.AvgAsync(Expression> column) @@ -208,6 +213,11 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).AnyAsync(); } + + async Task ISelect.ToOneAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync() => (await (this as ISelect).ToListAsync()).FirstOrDefault(); + #endif } } \ No newline at end of file diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs index e3ab43e0..075397f7 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; @@ -104,7 +105,7 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } - string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex) + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; @@ -153,6 +154,10 @@ namespace FreeSql.Internal.CommonProvider return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).Any(); } + TReturn ISelect.ToOne(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TReturn ISelect.First(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TDto ISelect.First() => (this as ISelect).ToList().FirstOrDefault(); + #if net40 #else Task ISelect.AvgAsync(Expression> column) @@ -211,6 +216,11 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).AnyAsync(); } + + async Task ISelect.ToOneAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync() => (await (this as ISelect).ToListAsync()).FirstOrDefault(); + #endif } } \ No newline at end of file diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs index 97633b78..d21e16a2 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; @@ -107,7 +108,7 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } - string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex) + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; @@ -156,6 +157,10 @@ namespace FreeSql.Internal.CommonProvider return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).Any(); } + TReturn ISelect.ToOne(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TReturn ISelect.First(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TDto ISelect.First() => (this as ISelect).ToList().FirstOrDefault(); + #if net40 #else Task ISelect.AvgAsync(Expression> column) @@ -214,6 +219,11 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).AnyAsync(); } + + async Task ISelect.ToOneAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync() => (await (this as ISelect).ToListAsync()).FirstOrDefault(); + #endif } } \ No newline at end of file diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs index 1f3dfd02..5669598d 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; @@ -110,7 +111,7 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } - string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex) + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; @@ -159,6 +160,10 @@ namespace FreeSql.Internal.CommonProvider return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).Any(); } + TReturn ISelect.ToOne(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TReturn ISelect.First(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TDto ISelect.First() => (this as ISelect).ToList().FirstOrDefault(); + #if net40 #else Task ISelect.AvgAsync(Expression> column) @@ -217,6 +222,11 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).AnyAsync(); } + + async Task ISelect.ToOneAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync() => (await (this as ISelect).ToListAsync()).FirstOrDefault(); + #endif } } \ No newline at end of file diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs index b6e443f8..a8f94ac3 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; @@ -113,7 +114,7 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } - string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex) + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; @@ -162,6 +163,10 @@ namespace FreeSql.Internal.CommonProvider return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).Any(); } + TReturn ISelect.ToOne(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TReturn ISelect.First(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TDto ISelect.First() => (this as ISelect).ToList().FirstOrDefault(); + #if net40 #else Task ISelect.AvgAsync(Expression> column) @@ -220,6 +225,11 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).AnyAsync(); } + + async Task ISelect.ToOneAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync() => (await (this as ISelect).ToListAsync()).FirstOrDefault(); + #endif } } \ No newline at end of file diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs index 3c47a61e..f85d2df9 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; @@ -117,7 +118,7 @@ namespace FreeSql.Internal.CommonProvider return this.InternalToDataTable(select?.Body); } - string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex) + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; @@ -166,6 +167,10 @@ namespace FreeSql.Internal.CommonProvider return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).Any(); } + TReturn ISelect.ToOne(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TReturn ISelect.First(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TDto ISelect.First() => (this as ISelect).ToList().FirstOrDefault(); + #if net40 #else Task ISelect.AvgAsync(Expression> column) @@ -224,6 +229,11 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < exp.Parameters.Count; a++) _tables[a].Parameter = exp.Parameters[a]; return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).AnyAsync(); } + + async Task ISelect.ToOneAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync() => (await (this as ISelect).ToListAsync()).FirstOrDefault(); + #endif } } \ No newline at end of file diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs index 5011cfa1..d03d4ba0 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; @@ -117,7 +118,7 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; return this.InternalToDataTable(select?.Body); } - string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias = FieldAliasOptions.AsIndex) + string ISelect.ToSql(Expression> select, FieldAliasOptions fieldAlias) { if (select == null) return this.InternalToSql(select?.Body, fieldAlias); for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; @@ -163,6 +164,10 @@ namespace FreeSql.Internal.CommonProvider return this.Where(_commonExpression.ExpressionWhereLambda(_tables, exp?.Body, null, _whereCascadeExpression, _params)).Any(); } + TReturn ISelect.ToOne(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TReturn ISelect.First(Expression> select) => (this as ISelect).ToList(select).FirstOrDefault(); + TDto ISelect.First() => (this as ISelect).ToList().FirstOrDefault(); + #if net40 #else Task ISelect.AnyAsync(Expression> exp) @@ -222,6 +227,11 @@ namespace FreeSql.Internal.CommonProvider for (var a = 0; a < select.Parameters.Count; a++) _tables[a].Parameter = select.Parameters[a]; return this.InternalToListAsync(select?.Body); } + + async Task ISelect.ToOneAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync(Expression> select) => (await (this as ISelect).ToListAsync(select)).FirstOrDefault(); + async Task ISelect.FirstAsync() => (await (this as ISelect).ToListAsync()).FirstOrDefault(); + #endif } } \ No newline at end of file diff --git a/FreeSql/Internal/UtilsExpressionTree.cs b/FreeSql/Internal/UtilsExpressionTree.cs index 8f8ce4e3..c8b1b92f 100644 --- a/FreeSql/Internal/UtilsExpressionTree.cs +++ b/FreeSql/Internal/UtilsExpressionTree.cs @@ -98,10 +98,7 @@ namespace FreeSql.Internal { Name = p.Name, DbType = tp.Value.dbtypeFull, - IsIdentity = false, IsNullable = tp.Value.isnullable ?? true, - IsPrimary = false, - IsIgnore = false, MapType = p.PropertyType }; if (colattr._IsNullable == null) colattr._IsNullable = tp?.isnullable; diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengCodeFirst.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengCodeFirst.cs index 09a14594..f9e6d7d0 100644 --- a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengCodeFirst.cs +++ b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengCodeFirst.cs @@ -425,7 +425,7 @@ and not exists(select 1 from all_constraints where index_name = a.index_name and var data_length = long.Parse(string.Concat(a[2])); long.TryParse(string.Concat(a[3]), out var data_precision); long.TryParse(string.Concat(a[4]), out var data_scale); - var char_used = string.Concat(a[5]); + //var char_used = string.Concat(a[5]); if (sqlType.StartsWith("INTERVAL DAY TO SECOND")) sqlType = $"INTERVAL DAY({(data_scale - 1536) / 16}) TO SECOND({(data_scale - 1536) % 16})"; else if (Regex.IsMatch(sqlType, @"INTERVAL YEAR\(\d+\) TO MONTH", RegexOptions.IgnoreCase))