diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml index 4ccbbef74..91534b2e5 100644 --- a/FreeSql/FreeSql.xml +++ b/FreeSql/FreeSql.xml @@ -1087,93 +1087,6 @@ - - - 动态创建实体类型 - - - - - 配置Class - - 类名 - 类标记的特性[Table(Name = "xxx")] [Index(xxxx)] - - - - - 获取类型构建器，可作为要构建的Type来引用 - - - - - 配置属性 - - 属性名称 - 属性类型 - 属性标记的特性-支持多个 - - - - - 配置属性 - - 属性名称 - 属性类型 - 该属性是否重写父类属性 - 属性标记的特性-支持多个 - - - - - 配置属性 - - 属性名称 - 属性类型 - 该属性是否重写父类属性 - 属性默认值 - 属性标记的特性-支持多个 - - - - - 配置父类 - - 父类类型 - - - - - Override属性 - - - - - - Emit动态创建出Class - Type - - - - - - Emit动态创建出Class - Type，不附带获取TableInfo - - - - - - 首字母小写 - - - - - - - 首字母大写 - - - - 获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 "" @@ -3376,13 +3289,6 @@ - - - 执行SQL语句，返回更新后的记录 - 注意：此方法只有 Postgresql/SqlServer 有效果 - - - 指定事务对象 @@ -3727,177 +3633,6 @@ - - - 测试数据库是否连接正确，本方法执行如下命令： - MySql/SqlServer/PostgreSQL/达梦/人大金仓/神通: SELECT 1 - Oracle: SELECT 1 FROM dual - - 命令超时设置(秒) - - true: 成功, false: 失败 - - - - 查询，若使用读写分离，查询【从库】条件cmdText.StartsWith("SELECT ")，否则查询【主库】 - - - - - - - - - - 查询，ExecuteReaderAsync(dr => {}, "select * from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 查询 - - - - - - - - - 查询，ExecuteArrayAsync("select * from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 查询 - - - - - - - - - 查询，ExecuteDataSetAsync("select * from user where age > @age; select 2", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 查询 - - - - - - - - - 查询，ExecuteDataTableAsync("select * from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 在【主库】执行 - - - - - - - - - 在【主库】执行，ExecuteNonQueryAsync("delete from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 在【主库】执行 - - - - - - - - - 在【主库】执行，ExecuteScalarAsync("select 1 from user where age > @age", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - 执行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 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - - - 执行SQL返回对象集合，Query<User>("select * from user where age > @age; select * from address", new SqlParameter { ParameterName = "age", Value = 25 }) - - - - - - - - - - - - 执行SQL返回对象集合，Query<User, Address>("select * from user where age > @age; select * from address", new { age = 25 }) - 提示：parms 参数还可以传 Dictionary<string, object> - - - - - - - - 可自定义解析表达式 @@ -4897,12 +4632,6 @@ 超时 - - - 获取资源 - - - 使用完毕后，归还资源 @@ -4978,12 +4707,6 @@ 资源对象 - - - 从对象池获取对象成功的时候触发，通过该方法统计或初始化对象 - - 资源对象 - 归还对象给对象池的时候触发 @@ -5897,28 +5620,6 @@ 对象池 - - - 动态构建Class Type - - - - - - 根据字典，创建 table 对应的实体对象 - - - - - - - - 根据实体对象，创建 table 对应的字典 - - - - - C#： that >= between && that <= and diff --git a/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengAdo.cs b/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengAdo.cs index 182c9246f..cbc4e5057 100644 --- a/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengAdo.cs +++ b/Providers/FreeSql.Provider.Dameng/DamengAdo/DamengAdo.cs @@ -40,7 +40,7 @@ namespace FreeSql.Dameng SlavePools.Add(slavePool); }); } - public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) + public override object AddslashesProcessParam(object param, Type mapType, Internal.Model.ColumnInfo mapColumn) { if (param == null) return "NULL"; if (mapType != null && mapType != param.GetType() && (param is IEnumerable == false)) diff --git a/Providers/FreeSql.Provider.Dameng/DamengCodeFirst.cs b/Providers/FreeSql.Provider.Dameng/DamengCodeFirst.cs index bb8efb2fd..3d63ef392 100644 --- a/Providers/FreeSql.Provider.Dameng/DamengCodeFirst.cs +++ b/Providers/FreeSql.Provider.Dameng/DamengCodeFirst.cs @@ -83,7 +83,7 @@ namespace FreeSql.Dameng { userId = DamengConnectionPool.GetUserId(conn.Value.ConnectionString); } - var seqcols = new List>(); //序列：列，表，自增 + var seqcols = new List>(); //序列：列，表，自增 var seqnameDel = new List(); //要删除的序列+触发器 var sb = new StringBuilder(); diff --git a/Providers/FreeSql.Provider.Dameng/DamengUtils.cs b/Providers/FreeSql.Provider.Dameng/DamengUtils.cs index 17d4e7029..71f79b2a0 100644 --- a/Providers/FreeSql.Provider.Dameng/DamengUtils.cs +++ b/Providers/FreeSql.Provider.Dameng/DamengUtils.cs @@ -15,7 +15,7 @@ namespace FreeSql.Dameng { } - public override DbParameter AppendParamter(List _params, string parameterName, ColumnInfo col, Type type, object value) + public override DbParameter AppendParamter(List _params, string parameterName, Internal.Model.ColumnInfo col, Type type, object value) { if (string.IsNullOrEmpty(parameterName)) parameterName = $"p_{_params?.Count}"; var dbtype = (DmDbType?)_orm.CodeFirst.GetDbInfo(type)?.type; @@ -114,7 +114,7 @@ namespace FreeSql.Dameng public override string QuoteWriteParamterAdapter(Type type, string paramterName) => paramterName; protected override string QuoteReadColumnAdapter(Type type, Type mapType, string columnName) => columnName; - public override string GetNoneParamaterSqlValue(List specialParams, string specialParamFlag, ColumnInfo col, Type type, object value) + public override string GetNoneParamaterSqlValue(List specialParams, string specialParamFlag, Internal.Model.ColumnInfo col, Type type, object value) { if (value == null) return "NULL"; if (type.IsNumberType()) return string.Format(CultureInfo.InvariantCulture, "{0}", value); diff --git a/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj b/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj index 2465161d8..9427466bb 100644 --- a/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj +++ b/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj @@ -25,32 +25,20 @@ - - - - - Always + - - - - - lib\DmProvider\netstandard2.0\DmProvider.dll - false - - - + ns20;netstandard20 diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.17739.nuspec b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.17739.nuspec deleted file mode 100644 index 3533ec24f..000000000 --- a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/DmProvider.1.1.0.17739.nuspec +++ /dev/null @@ -1,24 +0,0 @@ - - - - DmProvider - 1.1.0.17739 - DM - DM .NET PROVIDER - Copy right(C) DM - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/DmProvider.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/DmProvider.dll deleted file mode 100644 index 57df6bc51..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/DmProvider.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/en/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/en/DmProvider.resources.dll deleted file mode 100644 index f58316250..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/en/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/zh-CN/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/zh-CN/DmProvider.resources.dll deleted file mode 100644 index 66400ae48..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net40/zh-CN/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/DmProvider.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/DmProvider.dll deleted file mode 100644 index f6953f231..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/DmProvider.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/en/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/en/DmProvider.resources.dll deleted file mode 100644 index 616b8fefa..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/en/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/zh-CN/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/zh-CN/DmProvider.resources.dll deleted file mode 100644 index 85039f3f5..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net45/zh-CN/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net6.0/DmProvider.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net6.0/DmProvider.dll deleted file mode 100644 index 74eff7785..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net6.0/DmProvider.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net6.0/en/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net6.0/en/DmProvider.resources.dll deleted file mode 100644 index a537bd790..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net6.0/en/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net6.0/zh-CN/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net6.0/zh-CN/DmProvider.resources.dll deleted file mode 100644 index 66d580066..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/net6.0/zh-CN/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/DmProvider.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/DmProvider.dll deleted file mode 100644 index 00071e2ee..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/DmProvider.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/en/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/en/DmProvider.resources.dll deleted file mode 100644 index f0f65116f..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/en/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/zh-CN/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/zh-CN/DmProvider.resources.dll deleted file mode 100644 index 8a59af06e..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netcoreapp3.1/zh-CN/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/DmProvider.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/DmProvider.dll deleted file mode 100644 index da6c801b1..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/DmProvider.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/en/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/en/DmProvider.resources.dll deleted file mode 100644 index be37ace2d..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/en/DmProvider.resources.dll and /dev/null differ diff --git a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/zh-CN/DmProvider.resources.dll b/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/zh-CN/DmProvider.resources.dll deleted file mode 100644 index 86cecf1af..000000000 Binary files a/Providers/FreeSql.Provider.Dameng/lib/DmProvider/netstandard2.0/zh-CN/DmProvider.resources.dll and /dev/null differ