From e970bd731bef53262abd6dc946fb87c37dac0919 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Tue, 7 May 2019 22:13:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=20FreeSql.Interface=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FreeSqlExtensions/CodeFirstExtensions.cs | 1 - FreeSql.Tests/FreeSql.Tests.csproj | 3 +- .../SqlServer/SqlServerExpression/MathTest.cs | 8 +- FreeSql/DatabaseModel/DBTableInfo.cs | 7 +- FreeSql/FreeSql.xml | 1692 ++++++++--------- FreeSql/Generator/TemplateGenerator.cs | 1 - FreeSql/Interface/Curd/ISelect/ILinqToSql.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelect0.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelect1.cs | 5 +- FreeSql/Interface/Curd/ISelect/ISelect10.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelect2.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelect3.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelect4.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelect5.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelect6.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelect7.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelect8.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelect9.cs | 2 +- FreeSql/Interface/Curd/ISelect/ISelectFrom.cs | 2 +- .../Interface/Curd/ISelect/ISelectGrouping.cs | 2 +- FreeSql/Interface/IAdo.cs | 2 +- FreeSql/Interface/IAop.cs | 2 +- FreeSql/Interface/ICache.cs | 2 +- FreeSql/Interface/ICodeFirst.cs | 2 +- FreeSql/Interface/IFreeSql.cs | 1 - FreeSql/Interface/iDbFirst.cs | 2 +- FreeSql/Internal/CommonExpression.cs | 1 - .../CommonProvider/AdoProvider/AdoProvider.cs | 1 - .../Internal/CommonProvider/AopProvider.cs | 1 - .../Internal/CommonProvider/CacheProvider.cs | 3 +- .../SelectProvider/Select0Provider.cs | 3 +- .../SelectProvider/Select10Provider.cs | 3 +- .../SelectProvider/Select1Provider.cs | 3 +- .../SelectProvider/Select2Provider.cs | 3 +- .../SelectProvider/Select3Provider.cs | 3 +- .../SelectProvider/Select4Provider.cs | 3 +- .../SelectProvider/Select5Provider.cs | 3 +- .../SelectProvider/Select6Provider.cs | 3 +- .../SelectProvider/Select7Provider.cs | 3 +- .../SelectProvider/Select8Provider.cs | 3 +- .../SelectProvider/Select9Provider.cs | 3 +- .../SelectProvider/SelectGroupingProvider.cs | 3 +- FreeSql/Internal/CommonUtils.cs | 1 - FreeSql/MySql/Curd/MySqlSelect.cs | 3 +- FreeSql/MySql/MySqlAdo/MySqlAdo.cs | 3 +- FreeSql/MySql/MySqlCodeFirst.cs | 1 - FreeSql/MySql/MySqlDbFirst.cs | 1 - FreeSql/MySql/MySqlProvider.cs | 3 +- FreeSql/Oracle/Curd/OracleSelect.cs | 3 +- FreeSql/Oracle/OracleAdo/OracleAdo.cs | 3 +- FreeSql/Oracle/OracleCodeFirst.cs | 1 - FreeSql/Oracle/OracleDbFirst.cs | 7 +- FreeSql/Oracle/OracleProvider.cs | 3 +- FreeSql/PostgreSQL/Curd/PostgreSQLSelect.cs | 3 +- .../PostgreSQL/PostgreSQLAdo/PostgreSQLAdo.cs | 3 +- FreeSql/PostgreSQL/PostgreSQLCodeFirst.cs | 1 - FreeSql/PostgreSQL/PostgreSQLDbFirst.cs | 1 - FreeSql/PostgreSQL/PostgreSQLProvider.cs | 3 +- FreeSql/SqlServer/Curd/SqlServerSelect.cs | 3 +- .../SqlServer/SqlServerAdo/SqlServerAdo.cs | 3 +- FreeSql/SqlServer/SqlServerCodeFirst.cs | 7 +- FreeSql/SqlServer/SqlServerDbFirst.cs | 1 - FreeSql/SqlServer/SqlServerProvider.cs | 3 +- FreeSql/Sqlite/Curd/SqliteSelect.cs | 3 +- FreeSql/Sqlite/SqliteAdo/SqliteAdo.cs | 3 +- FreeSql/Sqlite/SqliteCodeFirst.cs | 1 - FreeSql/Sqlite/SqliteProvider.cs | 3 +- 67 files changed, 910 insertions(+), 953 deletions(-) diff --git a/Examples/efcore_to_freesql/FreeSqlExtensions/CodeFirstExtensions.cs b/Examples/efcore_to_freesql/FreeSqlExtensions/CodeFirstExtensions.cs index e9ce6964..9c480405 100644 --- a/Examples/efcore_to_freesql/FreeSqlExtensions/CodeFirstExtensions.cs +++ b/Examples/efcore_to_freesql/FreeSqlExtensions/CodeFirstExtensions.cs @@ -1,5 +1,4 @@ using FreeSql; -using FreeSql.Interface; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using System; diff --git a/FreeSql.Tests/FreeSql.Tests.csproj b/FreeSql.Tests/FreeSql.Tests.csproj index 28498764..df4aa29a 100644 --- a/FreeSql.Tests/FreeSql.Tests.csproj +++ b/FreeSql.Tests/FreeSql.Tests.csproj @@ -7,11 +7,11 @@ + - @@ -22,6 +22,7 @@ + diff --git a/FreeSql.Tests/SqlServer/SqlServerExpression/MathTest.cs b/FreeSql.Tests/SqlServer/SqlServerExpression/MathTest.cs index cab91615..7bab4502 100644 --- a/FreeSql.Tests/SqlServer/SqlServerExpression/MathTest.cs +++ b/FreeSql.Tests/SqlServer/SqlServerExpression/MathTest.cs @@ -79,13 +79,13 @@ namespace FreeSql.Tests.SqlServerExpression { } [Fact] public void Log() { - var data = new List(); - data.Add(select.Where(a => Math.Log(a.Clicks + 0.5) == a.Clicks + 1).ToList()); + //var data = new List(); + //data.Add(select.Where(a => Math.Log(a.Clicks + 0.5) == a.Clicks + 1).ToList()); } [Fact] public void Log10() { - var data = new List(); - data.Add(select.Where(a => Math.Log10(a.Clicks + 0.5) == a.Clicks + 1).ToList()); + //var data = new List(); + //data.Add(select.Where(a => Math.Log10(a.Clicks + 0.5) == a.Clicks + 1).ToList()); } [Fact] public void Pow() { diff --git a/FreeSql/DatabaseModel/DBTableInfo.cs b/FreeSql/DatabaseModel/DBTableInfo.cs index 4fc8ddfc..c662f7f3 100644 --- a/FreeSql/DatabaseModel/DBTableInfo.cs +++ b/FreeSql/DatabaseModel/DBTableInfo.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; namespace FreeSql.DatabaseModel { public class DbTableInfo { @@ -47,9 +48,9 @@ namespace FreeSql.DatabaseModel { /// public Dictionary ForeignsDict { get; internal set; } = new Dictionary(); - public IEnumerable> Uniques => UniquesDict.Values; - public IEnumerable> Indexes => IndexesDict.Values; - public IEnumerable Foreigns => ForeignsDict.Values; + public List> Uniques => UniquesDict.Values.ToList(); + public List> Indexes => IndexesDict.Values.ToList(); + public List Foreigns => ForeignsDict.Values.ToList(); } public enum DbTableType { diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml index 61eec5f6..3f15647c 100644 --- a/FreeSql/FreeSql.xml +++ b/FreeSql/FreeSql.xml @@ -682,66 +682,66 @@ - + 【linq to sql】专用方法，不建议直接使用 - + 【linq to sql】专用方法，不建议直接使用 - + 【linq to sql】专用方法，不建议直接使用 - + 【linq to sql】专用方法，不建议直接使用 - + 【linq to sql】专用方法，不建议直接使用 - + 指定事务对象 - + 指定连接对象 - + 审核或跟踪 ToList 即将返回的数据 - + 执行SQL查询，返回 DataTable - + 执行SQL查询，返回 T1 实体所有字段的记录，记录不存在时返回 Count 为 0 的列表 false: 返回 2级 LeftJoin/InnerJoin/RightJoin 对象；true: 返回所有 LeftJoin/InnerJoin/RightJoin 的导航数据 - + 执行SQL查询，返回 field 指定字段的记录，并以元组或基础类型(int,string,long)接收，记录不存在时返回 Count 为 0 的列表 @@ -749,65 +749,65 @@ - + 执行SQL查询，返回 T1 实体所有字段的第一条记录，记录不存在时返回 null - + 执行SQL查询，返回 T1 实体所有字段的第一条记录，记录不存在时返回 null - + 设置表名规则，可用于分库/分表，参数1：实体类型；参数2：默认表名；返回值：新表名； - + 动态Type，在使用 Select<object> 后使用本方法，指定实体类型 - + 返回即将执行的SQL语句 指定字段 - + 执行SQL查询，是否有记录 - + 查询的记录数量 - + 查询的记录数量，以参数out形式返回 返回的变量 - + 指定从主库查询（默认查询从库） - + 缓存查询结果 @@ -815,28 +815,28 @@ 缓存key - + 左联查询，使用导航属性自动生成SQL 表达式 - + 联接查询，使用导航属性自动生成SQL 表达式 - + 右联查询，使用导航属性自动生成SQL 表达式 - + 左联查询，指定关联的实体类型 @@ -844,7 +844,7 @@ 表达式 - + 联接查询，指定关联的实体类型 @@ -852,7 +852,7 @@ 表达式 - + 右联查询，指定关联的实体类型 @@ -860,7 +860,7 @@ 表达式 - + 左联查询，使用原生sql语法，LeftJoin("type b on b.id = a.id and b.clicks > ?clicks", new { clicks = 1 }) @@ -868,7 +868,7 @@ 参数 - + 联接查询，使用原生sql语法，InnerJoin("type b on b.id = a.id and b.clicks > ?clicks", new { clicks = 1 }) @@ -876,7 +876,7 @@ 参数 - + 右联查询，使用原生sql语法，RightJoin("type b on b.id = a.id and b.clicks > ?clicks", new { clicks = 1 }) @@ -884,7 +884,7 @@ 参数 - + 原生sql语法条件，Where("id = ?id", new { id = 1 }) @@ -892,7 +892,7 @@ 参数 - + 原生sql语法条件，WhereIf(true, "id = ?id", new { id = 1 }) @@ -901,7 +901,7 @@ 参数 - + 按原生sql语法分组，GroupBy("concat(name, ?cc)", new { cc = 1 }) @@ -909,7 +909,7 @@ 参数 - + 按原生sql语法聚合条件过滤，Having("count(name) = ?cc", new { cc = 1 }) @@ -917,7 +917,7 @@ 参数 - + 按原生sql语法排序，OrderBy("count(name) + ?cc", new { cc = 1 }) @@ -925,35 +925,35 @@ 参数 - + 查询向后偏移行数 - + 查询向后偏移行数 行数 - + 查询多少条数据 - + 查询多少条数据 - + 分页 @@ -961,807 +961,12 @@ 每页多少 - + 查询数据前，去重 - - - 查询条件，Where(a => a.Id > 10)，支持导航对象查询，Where(a => a.Author.Email == "2881099@qq.com") - - lambda表达式 - - - - - 查询条件，Where(true, a => a.Id > 10)，支导航对象查询，Where(true, a => a.Author.Email == "2881099@qq.com") - - true 时生效 - lambda表达式 - - - - - 按列排序，OrderBy(a => a.Time) - - - - - - - - 按列倒向排序，OrderByDescending(a => a.Time) - - 列 - - - - - 按聚合条件过滤，Where(a => a.Count() > 10) - - lambda表达式 - - - - - 按列排序，OrderBy(a => a.Time) - - - - - - - - 按列倒向排序，OrderByDescending(a => a.Time) - - 列 - - - - - 执行SQL查询，返回指定字段的记录，记录不存在时返回 Count 为 0 的列表 - - 返回类型 - 选择列 - - - - - 【linq to sql】专用方法，不建议直接使用 - - - - - 返回即将执行的SQL语句 - - 返回类型 - 选择列 - - - - - 查询向后偏移行数 - - - - - - - 查询向后偏移行数 - - 行数 - - - - - 查询多少条数据 - - - - - - - 查询多少条数据 - - - - - - - 分页 - - 第几页 - 每页多少 - - - - - 分组的数据 - - - - - 记录总数 - - - - - - 求和 - - - - - - - - 平均值 - - - - - - - - 最大值 - - - - - - - - 最小值 - - - - - - - 所有元素 - - - - - 主库连接池 - - - - - 从库连接池 - - - - - 监视数据库命令对象(执行前，调试) - - - - - 监视数据库命令对象(执行后，用于监视执行性能) - - - - - 数据库类型 - - - - - 开启事务（不支持异步），60秒未执行完将自动提交 - - 事务体 () => {} - - - - 开启事务（不支持异步） - - 事务体 () => {} - 超时，未执行完将自动提交 - - - - 当前线程的事务 - - - - - 事务完成前预删除缓存 - - - - - - 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】 - - - - - - - - - 查询，ExecuteReader(dr => {}, "select * from user where age > @age", new { age = 25 }) - - - - - - - 查询 - - - - - - - 查询，ExecuteArray("select * from user where age > @age", new { age = 25 }) - - - - - - - - 查询 - - - - - - - 查询，ExecuteDataSet("select * from user where age > @age; select 2", new { age = 25 }) - - - - - - - - 查询 - - - - - - - 查询，ExecuteDataTable("select * from user where age > @age", new { age = 25 }) - - - - - - - - 在【主库】执行 - - - - - - - - 在【主库】执行，ExecuteNonQuery("delete from user where age > @age", new { age = 25 }) - - - - - - - - 在【主库】执行 - - - - - - - - 在【主库】执行，ExecuteScalar("select 1 from user where age > @age", new { age = 25 }) - - - - - - - - 执行SQL返回对象集合，Query<User>("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 }) - - - - - - - - - - 执行SQL返回对象集合，Query<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 }) - - - - - - - - - 查询，若使用读写分离，查询【从库】条件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 }) - - - - - - - - - 监控 ToList 返回的的数据，用于拦截重新装饰 - - - - - 监视 Where，包括 select/update/delete，可控制使上层不被执行。 - - - - - 可自定义解析表达式 - - - - - 自定义实体的配置，方便和多个 ORM 共同使用 - - - - - 自定义实体的属性配置，方便和多个 ORM 共同使用 - - - - - 增删查改，执行命令之前触发 - - - - - 增删查改，执行命令完成后触发 - - - - - CodeFirst迁移，执行之前触发 - - - - - CodeFirst迁移，执行完成触发 - - - - - 缓存数据时序列化方法，若无设置则默认使用 Json.net - - - - - 获取缓存数据时反序列化方法，若无设置则默认使用 Json.net - - - - - 缓存可序列化数据 - - - 缓存键 - 可序列化数据 - 缓存秒数，<=0时永久缓存 - - - - 循环或批量获取缓存数据 - - - - - - - - 循环或批量获取缓存数据 - - - - - - - 循环或批量删除缓存键 - - 缓存键[数组] - - - - 缓存壳 - - 缓存类型 - 缓存键 - 缓存秒数 - 获取源数据的函数 - - - - - 缓存壳(哈希表) - - 缓存类型 - 缓存键 - 字段 - 缓存秒数 - 获取源数据的函数 - - - - - 缓存可序列化数据 - - - 缓存键 - 可序列化数据 - 缓存秒数，<=0时永久缓存 - - - - 循环或批量获取缓存数据 - - - - - - - - 循环或批量获取缓存数据 - - - - - - - 循环或批量删除缓存键 - - 缓存键[数组] - - - - 缓存壳 - - 缓存类型 - 缓存键 - 缓存秒数 - 获取源数据的函数 - - - - - 缓存壳(哈希表) - - 缓存类型 - 缓存键 - 字段 - 缓存秒数 - 获取源数据的函数 - - - - - 【开发环境必备】自动同步实体结构到数据库，程序运行中检查实体表是否存在，然后创建或修改 - - - - - 转小写同步结构 - - - - - 转大写同步结构 - - - - - 使用数据库的主键和自增，适用 DbFirst 模式，无须在实体类型上设置 [Column(IsPrimary)] 或者 ConfigEntity。此功能目前可用于 mysql/sqlserver/postgresql。 - - - - - 不使用命令参数化执行，针对 Insert/Update - - - - - 延时加载导航属性对象，导航属性需要声明 virtual - - - - - 将实体类型与数据库对比，返回DDL语句 - - - - - - - 将实体类型集合与数据库对比，返回DDL语句 - - - - - - - 同步实体类型到数据库 - - - - - - - 同步实体类型集合到数据库 - - - - - - - 根据 System.Type 获取数据库信息 - - - - - - - 在外部配置实体的特性 - - - - - - - - 在外部配置实体的特性 - - - - - - - - 获取在外部配置实体的特性 - - - 未使用ConfigEntity配置时，返回null - - - - 获取实体类核心配置 - - - - - - - 获取所有数据库 - - - - - - 获取指定数据库的表信息，包括表、列详情、主键、唯一键、索引、外键、备注 - - - - - - - 获取数据库枚举类型int值 - - - - - - - 获取c#转换，(int)、(long) - - - - - - - 获取c#值 - - - - - - - 获取c#类型，int、long - - - - - - - 获取c#类型对象 - - - - - - - 获取ado.net读取方法, GetBoolean、GetInt64 - - - - - - - 序列化 - - - - - - - 反序列化 - - - - - - - 获取数据库枚举类型，适用 PostgreSQL - - - - 执行SQL查询，是否有记录 @@ -1807,7 +1012,7 @@ 选择列 - + 执行SQL查询，返回指定字段的聚合结果 @@ -1854,7 +1059,7 @@ 别名 - + 多表查询 @@ -1862,7 +1067,7 @@ - + 多表查询 @@ -1871,7 +1076,7 @@ - + 多表查询 @@ -1881,7 +1086,7 @@ - + 多表查询 @@ -1892,7 +1097,7 @@ - + 多表查询 @@ -1904,7 +1109,7 @@ - + 多表查询 @@ -1917,7 +1122,7 @@ - + 多表查询 @@ -1931,7 +1136,7 @@ - + 多表查询 @@ -1946,7 +1151,7 @@ - + 多表查询 @@ -2051,6 +1256,162 @@ 列 + + + 查询条件，Where(a => a.Id > 10)，支持导航对象查询，Where(a => a.Author.Email == "2881099@qq.com") + + lambda表达式 + + + + + 查询条件，Where(true, a => a.Id > 10)，支导航对象查询，Where(true, a => a.Author.Email == "2881099@qq.com") + + true 时生效 + lambda表达式 + + + + + 按列排序，OrderBy(a => a.Time) + + + + + + + + 按列倒向排序，OrderByDescending(a => a.Time) + + 列 + + + + + 按聚合条件过滤，Where(a => a.Count() > 10) + + lambda表达式 + + + + + 按列排序，OrderBy(a => a.Time) + + + + + + + + 按列倒向排序，OrderByDescending(a => a.Time) + + 列 + + + + + 执行SQL查询，返回指定字段的记录，记录不存在时返回 Count 为 0 的列表 + + 返回类型 + 选择列 + + + + + 【linq to sql】专用方法，不建议直接使用 + + + + + 返回即将执行的SQL语句 + + 返回类型 + 选择列 + + + + + 查询向后偏移行数 + + + + + + + 查询向后偏移行数 + + 行数 + + + + + 查询多少条数据 + + + + + + + 查询多少条数据 + + + + + + + 分页 + + 第几页 + 每页多少 + + + + + 分组的数据 + + + + + 记录总数 + + + + + + 求和 + + + + + + + + 平均值 + + + + + + + + 最大值 + + + + + + + + 最小值 + + + + + + + 所有元素 + + 指定事务对象 @@ -2215,6 +1576,362 @@ + + + 主库连接池 + + + + + 从库连接池 + + + + + 监视数据库命令对象(执行前，调试) + + + + + 监视数据库命令对象(执行后，用于监视执行性能) + + + + + 数据库类型 + + + + + 开启事务（不支持异步），60秒未执行完将自动提交 + + 事务体 () => {} + + + + 开启事务（不支持异步） + + 事务体 () => {} + 超时，未执行完将自动提交 + + + + 当前线程的事务 + + + + + 事务完成前预删除缓存 + + + + + + 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】 + + + + + + + + + 查询，ExecuteReader(dr => {}, "select * from user where age > @age", new { age = 25 }) + + + + + + + 查询 + + + + + + + 查询，ExecuteArray("select * from user where age > @age", new { age = 25 }) + + + + + + + + 查询 + + + + + + + 查询，ExecuteDataSet("select * from user where age > @age; select 2", new { age = 25 }) + + + + + + + + 查询 + + + + + + + 查询，ExecuteDataTable("select * from user where age > @age", new { age = 25 }) + + + + + + + + 在【主库】执行 + + + + + + + + 在【主库】执行，ExecuteNonQuery("delete from user where age > @age", new { age = 25 }) + + + + + + + + 在【主库】执行 + + + + + + + + 在【主库】执行，ExecuteScalar("select 1 from user where age > @age", new { age = 25 }) + + + + + + + + 执行SQL返回对象集合，Query<User>("select * from user where age > @age", new SqlParameter { ParameterName = "age", Value = 25 }) + + + + + + + + + + 执行SQL返回对象集合，Query<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 }) + + + + + + + + + 查询，若使用读写分离，查询【从库】条件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 }) + + + + + + + + + 监控 ToList 返回的的数据，用于拦截重新装饰 + + + + + 监视 Where，包括 select/update/delete，可控制使上层不被执行。 + + + + + 可自定义解析表达式 + + + + + 自定义实体的配置，方便和多个 ORM 共同使用 + + + + + 自定义实体的属性配置，方便和多个 ORM 共同使用 + + + + + 增删查改，执行命令之前触发 + + + + + 增删查改，执行命令完成后触发 + + + + + CodeFirst迁移，执行之前触发 + + + + + CodeFirst迁移，执行完成触发 + + 可重新装饰的引用数据 @@ -2340,6 +2057,289 @@ 耗时（单位：毫秒） + + + 缓存数据时序列化方法，若无设置则默认使用 Json.net + + + + + 获取缓存数据时反序列化方法，若无设置则默认使用 Json.net + + + + + 缓存可序列化数据 + + + 缓存键 + 可序列化数据 + 缓存秒数，<=0时永久缓存 + + + + 循环或批量获取缓存数据 + + + + + + + + 循环或批量获取缓存数据 + + + + + + + 循环或批量删除缓存键 + + 缓存键[数组] + + + + 缓存壳 + + 缓存类型 + 缓存键 + 缓存秒数 + 获取源数据的函数 + + + + + 缓存壳(哈希表) + + 缓存类型 + 缓存键 + 字段 + 缓存秒数 + 获取源数据的函数 + + + + + 缓存可序列化数据 + + + 缓存键 + 可序列化数据 + 缓存秒数，<=0时永久缓存 + + + + 循环或批量获取缓存数据 + + + + + + + + 循环或批量获取缓存数据 + + + + + + + 循环或批量删除缓存键 + + 缓存键[数组] + + + + 缓存壳 + + 缓存类型 + 缓存键 + 缓存秒数 + 获取源数据的函数 + + + + + 缓存壳(哈希表) + + 缓存类型 + 缓存键 + 字段 + 缓存秒数 + 获取源数据的函数 + + + + + 【开发环境必备】自动同步实体结构到数据库，程序运行中检查实体表是否存在，然后创建或修改 + + + + + 转小写同步结构 + + + + + 转大写同步结构 + + + + + 使用数据库的主键和自增，适用 DbFirst 模式，无须在实体类型上设置 [Column(IsPrimary)] 或者 ConfigEntity。此功能目前可用于 mysql/sqlserver/postgresql。 + + + + + 不使用命令参数化执行，针对 Insert/Update + + + + + 延时加载导航属性对象，导航属性需要声明 virtual + + + + + 将实体类型与数据库对比，返回DDL语句 + + + + + + + 将实体类型集合与数据库对比，返回DDL语句 + + + + + + + 同步实体类型到数据库 + + + + + + + 同步实体类型集合到数据库 + + + + + + + 根据 System.Type 获取数据库信息 + + + + + + + 在外部配置实体的特性 + + + + + + + + 在外部配置实体的特性 + + + + + + + + 获取在外部配置实体的特性 + + + 未使用ConfigEntity配置时，返回null + + + + 获取实体类核心配置 + + + + + + + 获取所有数据库 + + + + + + 获取指定数据库的表信息，包括表、列详情、主键、唯一键、索引、外键、备注 + + + + + + + 获取数据库枚举类型int值 + + + + + + + 获取c#转换，(int)、(long) + + + + + + + 获取c#值 + + + + + + + 获取c#类型，int、long + + + + + + + 获取c#类型对象 + + + + + + + 获取ado.net读取方法, GetBoolean、GetInt64 + + + + + + + 序列化 + + + + + + + 反序列化 + + + + + + + 获取数据库枚举类型，适用 PostgreSQL + + + + 中间表，多对多 diff --git a/FreeSql/Generator/TemplateGenerator.cs b/FreeSql/Generator/TemplateGenerator.cs index deb4b811..d97c255e 100644 --- a/FreeSql/Generator/TemplateGenerator.cs +++ b/FreeSql/Generator/TemplateGenerator.cs @@ -1,5 +1,4 @@ using FreeSql.DatabaseModel; -using FreeSql.Interface; using System; using System.Collections.Generic; using System.IO; diff --git a/FreeSql/Interface/Curd/ISelect/ILinqToSql.cs b/FreeSql/Interface/Curd/ISelect/ILinqToSql.cs index 3879d942..9d0bea94 100644 --- a/FreeSql/Interface/Curd/ISelect/ILinqToSql.cs +++ b/FreeSql/Interface/Curd/ISelect/ILinqToSql.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq.Expressions; using System.Text; -namespace FreeSql.Interface { +namespace FreeSql { public interface ILinqToSql where T1 : class { /// /// 【linq to sql】专用方法，不建议直接使用 diff --git a/FreeSql/Interface/Curd/ISelect/ISelect0.cs b/FreeSql/Interface/Curd/ISelect/ISelect0.cs index 0f417ffc..562d26ed 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect0.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect0.cs @@ -6,7 +6,7 @@ using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelect0 { /// diff --git a/FreeSql/Interface/Curd/ISelect/ISelect1.cs b/FreeSql/Interface/Curd/ISelect/ISelect1.cs index 80c69918..b824b665 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect1.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect1.cs @@ -1,12 +1,11 @@ -using FreeSql.Interface; -using System; +using System; using System.Collections.Generic; using System.Data; using System.Linq.Expressions; using System.Threading.Tasks; namespace FreeSql { - public interface ISelect : ISelect0, T1>, Interface.ILinqToSql where T1 : class { + public interface ISelect : ISelect0, T1>, ILinqToSql where T1 : class { /// /// 执行SQL查询，是否有记录 diff --git a/FreeSql/Interface/Curd/ISelect/ISelect10.cs b/FreeSql/Interface/Curd/ISelect/ISelect10.cs index fe9c60d9..8f2f7d5b 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect10.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect10.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq.Expressions; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelect : ISelect0, T1> where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class { bool Any(Expression> exp); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect2.cs b/FreeSql/Interface/Curd/ISelect/ISelect2.cs index ba74ff59..aff7f5e2 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect2.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect2.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq.Expressions; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelect : ISelect0, T1> where T1 : class where T2 : class { bool Any(Expression> exp); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect3.cs b/FreeSql/Interface/Curd/ISelect/ISelect3.cs index 010b7217..0d965e21 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect3.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect3.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq.Expressions; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelect : ISelect0, T1> where T1 : class where T2 : class where T3 : class { bool Any(Expression> exp); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect4.cs b/FreeSql/Interface/Curd/ISelect/ISelect4.cs index 35b299ee..d662d788 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect4.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect4.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq.Expressions; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelect : ISelect0, T1> where T1 : class where T2 : class where T3 : class where T4 : class { bool Any(Expression> exp); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect5.cs b/FreeSql/Interface/Curd/ISelect/ISelect5.cs index 1e9dde5b..ffcf4294 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect5.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect5.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq.Expressions; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelect : ISelect0, T1> where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class { bool Any(Expression> exp); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect6.cs b/FreeSql/Interface/Curd/ISelect/ISelect6.cs index d45aa0b7..30ebba85 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect6.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect6.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq.Expressions; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelect : ISelect0, T1> where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class { bool Any(Expression> exp); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect7.cs b/FreeSql/Interface/Curd/ISelect/ISelect7.cs index 602fc256..21631412 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect7.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect7.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq.Expressions; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelect : ISelect0, T1> where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class { bool Any(Expression> exp); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect8.cs b/FreeSql/Interface/Curd/ISelect/ISelect8.cs index 11801277..e30882f8 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect8.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect8.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq.Expressions; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelect : ISelect0, T1> where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class { bool Any(Expression> exp); diff --git a/FreeSql/Interface/Curd/ISelect/ISelect9.cs b/FreeSql/Interface/Curd/ISelect/ISelect9.cs index 78f2aa42..d3c827ca 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect9.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect9.cs @@ -4,7 +4,7 @@ using System.Data; using System.Linq.Expressions; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelect : ISelect0, T1> where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class { bool Any(Expression> exp); diff --git a/FreeSql/Interface/Curd/ISelect/ISelectFrom.cs b/FreeSql/Interface/Curd/ISelect/ISelectFrom.cs index bcf8d9e4..9150034e 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelectFrom.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelectFrom.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq.Expressions; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelectFromExpression where T1 : class { ISelectFromExpression LeftJoin(Expression> exp); diff --git a/FreeSql/Interface/Curd/ISelect/ISelectGrouping.cs b/FreeSql/Interface/Curd/ISelect/ISelectGrouping.cs index 08912adb..17c8ec0f 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelectGrouping.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelectGrouping.cs @@ -4,7 +4,7 @@ using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ISelectGrouping { /// /// 按聚合条件过滤，Where(a => a.Count() > 10) diff --git a/FreeSql/Interface/IAdo.cs b/FreeSql/Interface/IAdo.cs index 25177899..5f2263b1 100644 --- a/FreeSql/Interface/IAdo.cs +++ b/FreeSql/Interface/IAdo.cs @@ -7,7 +7,7 @@ using System.Data.Common; using System.Text; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public partial interface IAdo { /// /// 主库连接池 diff --git a/FreeSql/Interface/IAop.cs b/FreeSql/Interface/IAop.cs index 282817fd..6fb82996 100644 --- a/FreeSql/Interface/IAop.cs +++ b/FreeSql/Interface/IAop.cs @@ -7,7 +7,7 @@ using System.Diagnostics; using System.Linq.Expressions; using System.Reflection; -namespace FreeSql.Interface { +namespace FreeSql { public interface IAop { /// diff --git a/FreeSql/Interface/ICache.cs b/FreeSql/Interface/ICache.cs index c084d5a3..49bbbf0c 100644 --- a/FreeSql/Interface/ICache.cs +++ b/FreeSql/Interface/ICache.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace FreeSql.Interface { +namespace FreeSql { public interface ICache { /// diff --git a/FreeSql/Interface/ICodeFirst.cs b/FreeSql/Interface/ICodeFirst.cs index fb163630..5e0c06dd 100644 --- a/FreeSql/Interface/ICodeFirst.cs +++ b/FreeSql/Interface/ICodeFirst.cs @@ -2,7 +2,7 @@ using FreeSql.Internal.Model; using System; -namespace FreeSql.Interface { +namespace FreeSql { public interface ICodeFirst { /// diff --git a/FreeSql/Interface/IFreeSql.cs b/FreeSql/Interface/IFreeSql.cs index 07fec146..0350a8f3 100644 --- a/FreeSql/Interface/IFreeSql.cs +++ b/FreeSql/Interface/IFreeSql.cs @@ -1,5 +1,4 @@ using FreeSql; -using FreeSql.Interface; using System; using System.Collections.Generic; diff --git a/FreeSql/Interface/iDbFirst.cs b/FreeSql/Interface/iDbFirst.cs index 69eca66d..2aa495a8 100644 --- a/FreeSql/Interface/iDbFirst.cs +++ b/FreeSql/Interface/iDbFirst.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; -namespace FreeSql.Interface { +namespace FreeSql { public interface IDbFirst { /// diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs index 96b0d9d1..9003906f 100644 --- a/FreeSql/Internal/CommonExpression.cs +++ b/FreeSql/Internal/CommonExpression.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; using System.Text; -using FreeSql.Interface; namespace FreeSql.Internal { internal abstract class CommonExpression { diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs index 755d2659..d6ae51a8 100644 --- a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs +++ b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs @@ -9,7 +9,6 @@ using System.Diagnostics; using System.Linq; using System.Text; using System.Reflection; -using FreeSql.Interface; namespace FreeSql.Internal.CommonProvider { abstract partial class AdoProvider : IAdo, IDisposable { diff --git a/FreeSql/Internal/CommonProvider/AopProvider.cs b/FreeSql/Internal/CommonProvider/AopProvider.cs index 86eb1641..f7a8faf7 100644 --- a/FreeSql/Internal/CommonProvider/AopProvider.cs +++ b/FreeSql/Internal/CommonProvider/AopProvider.cs @@ -1,5 +1,4 @@  -using FreeSql.Interface; using System; using System.Collections.Generic; using System.Linq.Expressions; diff --git a/FreeSql/Internal/CommonProvider/CacheProvider.cs b/FreeSql/Internal/CommonProvider/CacheProvider.cs index 9bb22ee2..4bbda7da 100644 --- a/FreeSql/Internal/CommonProvider/CacheProvider.cs +++ b/FreeSql/Internal/CommonProvider/CacheProvider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs index 3559c9c3..175aced0 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs index 521577f8..71adbbc1 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select10Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Data; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs index c331e17f..2f5cdd11 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Data; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs index b92c3841..21b124a3 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select2Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Data; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs index 3f732d0e..add6d4bf 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select3Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Data; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs index 0434ff21..358015ad 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select4Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Data; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs index 8b1a353e..c42d5e59 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select5Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Data; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs index 00a8a76d..497ee66f 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select6Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Data; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs index 45def594..75c70ea4 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select7Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Data; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs index 8909f288..1abc8e53 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select8Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Data; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs index 4b736e9c..64b8e466 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select9Provider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Data; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs index 8f4236bd..075235b7 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal.Model; +using FreeSql.Internal.Model; using System; using System.Collections.Generic; using System.Linq; diff --git a/FreeSql/Internal/CommonUtils.cs b/FreeSql/Internal/CommonUtils.cs index 061f8e4d..540f7c19 100644 --- a/FreeSql/Internal/CommonUtils.cs +++ b/FreeSql/Internal/CommonUtils.cs @@ -1,7 +1,6 @@ using FreeSql.DataAnnotations; using FreeSql.DatabaseModel; using FreeSql.Extensions.EntityUtil; -using FreeSql.Interface; using FreeSql.Internal.Model; using System; using System.Collections; diff --git a/FreeSql/MySql/Curd/MySqlSelect.cs b/FreeSql/MySql/Curd/MySqlSelect.cs index 0f850298..2a856b34 100644 --- a/FreeSql/MySql/Curd/MySqlSelect.cs +++ b/FreeSql/MySql/Curd/MySqlSelect.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using FreeSql.Internal.Model; using System; using System.Collections.Generic; diff --git a/FreeSql/MySql/MySqlAdo/MySqlAdo.cs b/FreeSql/MySql/MySqlAdo/MySqlAdo.cs index 9b47827d..388aaeb0 100644 --- a/FreeSql/MySql/MySqlAdo/MySqlAdo.cs +++ b/FreeSql/MySql/MySqlAdo/MySqlAdo.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using Microsoft.Extensions.Logging; using MySql.Data.MySqlClient; using SafeObjectPool; diff --git a/FreeSql/MySql/MySqlCodeFirst.cs b/FreeSql/MySql/MySqlCodeFirst.cs index 26fd65b0..0fc738cf 100644 --- a/FreeSql/MySql/MySqlCodeFirst.cs +++ b/FreeSql/MySql/MySqlCodeFirst.cs @@ -1,6 +1,5 @@ using FreeSql.DataAnnotations; using FreeSql.DatabaseModel; -using FreeSql.Interface; using FreeSql.Internal; using FreeSql.Internal.Model; using MySql.Data.MySqlClient; diff --git a/FreeSql/MySql/MySqlDbFirst.cs b/FreeSql/MySql/MySqlDbFirst.cs index cff2d4ea..760aedc3 100644 --- a/FreeSql/MySql/MySqlDbFirst.cs +++ b/FreeSql/MySql/MySqlDbFirst.cs @@ -1,5 +1,4 @@ using FreeSql.DatabaseModel; -using FreeSql.Interface; using FreeSql.Internal; using MySql.Data.MySqlClient; using System; diff --git a/FreeSql/MySql/MySqlProvider.cs b/FreeSql/MySql/MySqlProvider.cs index 6436e947..2387c54a 100644 --- a/FreeSql/MySql/MySqlProvider.cs +++ b/FreeSql/MySql/MySqlProvider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using FreeSql.Internal.CommonProvider; using FreeSql.MySql.Curd; using Microsoft.Extensions.Caching.Distributed; diff --git a/FreeSql/Oracle/Curd/OracleSelect.cs b/FreeSql/Oracle/Curd/OracleSelect.cs index 3d78439d..24dcecda 100644 --- a/FreeSql/Oracle/Curd/OracleSelect.cs +++ b/FreeSql/Oracle/Curd/OracleSelect.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using FreeSql.Internal.Model; using System; using System.Collections.Generic; diff --git a/FreeSql/Oracle/OracleAdo/OracleAdo.cs b/FreeSql/Oracle/OracleAdo/OracleAdo.cs index 76a70b8a..0991e36a 100644 --- a/FreeSql/Oracle/OracleAdo/OracleAdo.cs +++ b/FreeSql/Oracle/OracleAdo/OracleAdo.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using Microsoft.Extensions.Logging; using Oracle.ManagedDataAccess.Client; using SafeObjectPool; diff --git a/FreeSql/Oracle/OracleCodeFirst.cs b/FreeSql/Oracle/OracleCodeFirst.cs index f6d8b736..16de5b60 100644 --- a/FreeSql/Oracle/OracleCodeFirst.cs +++ b/FreeSql/Oracle/OracleCodeFirst.cs @@ -1,6 +1,5 @@ using FreeSql.DataAnnotations; using FreeSql.DatabaseModel; -using FreeSql.Interface; using FreeSql.Internal; using FreeSql.Internal.Model; using Oracle.ManagedDataAccess.Client; diff --git a/FreeSql/Oracle/OracleDbFirst.cs b/FreeSql/Oracle/OracleDbFirst.cs index cd0aa289..8a9ef894 100644 --- a/FreeSql/Oracle/OracleDbFirst.cs +++ b/FreeSql/Oracle/OracleDbFirst.cs @@ -1,13 +1,12 @@ using FreeSql.DatabaseModel; using FreeSql.Internal; +using Oracle.ManagedDataAccess.Client; using System; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text.RegularExpressions; -using Oracle.ManagedDataAccess.Client; -using System.Data; -using FreeSql.Interface; namespace FreeSql.Oracle { class OracleDbFirst : IDbFirst { diff --git a/FreeSql/Oracle/OracleProvider.cs b/FreeSql/Oracle/OracleProvider.cs index 084a2aeb..b595f2a1 100644 --- a/FreeSql/Oracle/OracleProvider.cs +++ b/FreeSql/Oracle/OracleProvider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using FreeSql.Internal.CommonProvider; using FreeSql.Oracle.Curd; using Microsoft.Extensions.Caching.Distributed; diff --git a/FreeSql/PostgreSQL/Curd/PostgreSQLSelect.cs b/FreeSql/PostgreSQL/Curd/PostgreSQLSelect.cs index 8f6d81c5..d51e7fa7 100644 --- a/FreeSql/PostgreSQL/Curd/PostgreSQLSelect.cs +++ b/FreeSql/PostgreSQL/Curd/PostgreSQLSelect.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using FreeSql.Internal.Model; using System; using System.Collections.Generic; diff --git a/FreeSql/PostgreSQL/PostgreSQLAdo/PostgreSQLAdo.cs b/FreeSql/PostgreSQL/PostgreSQLAdo/PostgreSQLAdo.cs index 3c22724a..ed62824f 100644 --- a/FreeSql/PostgreSQL/PostgreSQLAdo/PostgreSQLAdo.cs +++ b/FreeSql/PostgreSQL/PostgreSQLAdo/PostgreSQLAdo.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; using Npgsql; diff --git a/FreeSql/PostgreSQL/PostgreSQLCodeFirst.cs b/FreeSql/PostgreSQL/PostgreSQLCodeFirst.cs index 504b4cf2..0b927c09 100644 --- a/FreeSql/PostgreSQL/PostgreSQLCodeFirst.cs +++ b/FreeSql/PostgreSQL/PostgreSQLCodeFirst.cs @@ -1,6 +1,5 @@ using FreeSql.DataAnnotations; using FreeSql.DatabaseModel; -using FreeSql.Interface; using FreeSql.Internal; using FreeSql.Internal.Model; using Newtonsoft.Json.Linq; diff --git a/FreeSql/PostgreSQL/PostgreSQLDbFirst.cs b/FreeSql/PostgreSQL/PostgreSQLDbFirst.cs index cd6a8e30..2db33d75 100644 --- a/FreeSql/PostgreSQL/PostgreSQLDbFirst.cs +++ b/FreeSql/PostgreSQL/PostgreSQLDbFirst.cs @@ -1,5 +1,4 @@ using FreeSql.DatabaseModel; -using FreeSql.Interface; using FreeSql.Internal; using Newtonsoft.Json.Linq; using Npgsql.LegacyPostgis; diff --git a/FreeSql/PostgreSQL/PostgreSQLProvider.cs b/FreeSql/PostgreSQL/PostgreSQLProvider.cs index 7188e4e8..bbc28288 100644 --- a/FreeSql/PostgreSQL/PostgreSQLProvider.cs +++ b/FreeSql/PostgreSQL/PostgreSQLProvider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using FreeSql.Internal.CommonProvider; using FreeSql.PostgreSQL.Curd; using Microsoft.Extensions.Caching.Distributed; diff --git a/FreeSql/SqlServer/Curd/SqlServerSelect.cs b/FreeSql/SqlServer/Curd/SqlServerSelect.cs index d74cc9da..1586f0af 100644 --- a/FreeSql/SqlServer/Curd/SqlServerSelect.cs +++ b/FreeSql/SqlServer/Curd/SqlServerSelect.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using FreeSql.Internal.Model; using System; using System.Collections.Generic; diff --git a/FreeSql/SqlServer/SqlServerAdo/SqlServerAdo.cs b/FreeSql/SqlServer/SqlServerAdo/SqlServerAdo.cs index 653e20e2..e8703114 100644 --- a/FreeSql/SqlServer/SqlServerAdo/SqlServerAdo.cs +++ b/FreeSql/SqlServer/SqlServerAdo/SqlServerAdo.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using Microsoft.Extensions.Logging; using SafeObjectPool; using System; diff --git a/FreeSql/SqlServer/SqlServerCodeFirst.cs b/FreeSql/SqlServer/SqlServerCodeFirst.cs index ac9706c2..b6997a74 100644 --- a/FreeSql/SqlServer/SqlServerCodeFirst.cs +++ b/FreeSql/SqlServer/SqlServerCodeFirst.cs @@ -1,15 +1,14 @@ -using FreeSql.DatabaseModel; +using FreeSql.DataAnnotations; +using FreeSql.DatabaseModel; using FreeSql.Internal; using FreeSql.Internal.Model; using System; -using System.Collections.Generic; using System.Collections.Concurrent; +using System.Collections.Generic; using System.Data; using System.Linq; using System.Text; using System.Text.RegularExpressions; -using FreeSql.DataAnnotations; -using FreeSql.Interface; namespace FreeSql.SqlServer { diff --git a/FreeSql/SqlServer/SqlServerDbFirst.cs b/FreeSql/SqlServer/SqlServerDbFirst.cs index b671a118..56405a7e 100644 --- a/FreeSql/SqlServer/SqlServerDbFirst.cs +++ b/FreeSql/SqlServer/SqlServerDbFirst.cs @@ -1,5 +1,4 @@ using FreeSql.DatabaseModel; -using FreeSql.Interface; using FreeSql.Internal; using System; using System.Collections.Generic; diff --git a/FreeSql/SqlServer/SqlServerProvider.cs b/FreeSql/SqlServer/SqlServerProvider.cs index 70135551..c81dc09a 100644 --- a/FreeSql/SqlServer/SqlServerProvider.cs +++ b/FreeSql/SqlServer/SqlServerProvider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using FreeSql.Internal.CommonProvider; using FreeSql.SqlServer.Curd; using Microsoft.Extensions.Caching.Distributed; diff --git a/FreeSql/Sqlite/Curd/SqliteSelect.cs b/FreeSql/Sqlite/Curd/SqliteSelect.cs index 42956775..d7dd6253 100644 --- a/FreeSql/Sqlite/Curd/SqliteSelect.cs +++ b/FreeSql/Sqlite/Curd/SqliteSelect.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using FreeSql.Internal.Model; using System; using System.Collections.Generic; diff --git a/FreeSql/Sqlite/SqliteAdo/SqliteAdo.cs b/FreeSql/Sqlite/SqliteAdo/SqliteAdo.cs index 4202cca5..736002a4 100644 --- a/FreeSql/Sqlite/SqliteAdo/SqliteAdo.cs +++ b/FreeSql/Sqlite/SqliteAdo/SqliteAdo.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using Microsoft.Extensions.Logging; using SafeObjectPool; using System; diff --git a/FreeSql/Sqlite/SqliteCodeFirst.cs b/FreeSql/Sqlite/SqliteCodeFirst.cs index f223424d..b4756b1e 100644 --- a/FreeSql/Sqlite/SqliteCodeFirst.cs +++ b/FreeSql/Sqlite/SqliteCodeFirst.cs @@ -1,6 +1,5 @@ using FreeSql.DataAnnotations; using FreeSql.DatabaseModel; -using FreeSql.Interface; using FreeSql.Internal; using FreeSql.Internal.Model; using System; diff --git a/FreeSql/Sqlite/SqliteProvider.cs b/FreeSql/Sqlite/SqliteProvider.cs index 7be7e23d..be1bcf45 100644 --- a/FreeSql/Sqlite/SqliteProvider.cs +++ b/FreeSql/Sqlite/SqliteProvider.cs @@ -1,5 +1,4 @@ -using FreeSql.Interface; -using FreeSql.Internal; +using FreeSql.Internal; using FreeSql.Internal.CommonProvider; using FreeSql.Sqlite.Curd; using Microsoft.Extensions.Caching.Distributed;