diff --git a/Docs/dbfirst.md b/Docs/dbfirst.md index e70b7a92..0c9f119a 100644 --- a/Docs/dbfirst.md +++ b/Docs/dbfirst.md @@ -33,7 +33,7 @@ var t2 = fsql.DbFirst.GetTablesByDatabase(fsql.DbFirst.GetDatabases()[0]); > 更多模板逐步开发中。。。 ```csharp -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(fsql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Docs/generator.md b/Docs/generator.md index 7900967a..66b01ceb 100644 --- a/Docs/generator.md +++ b/Docs/generator.md @@ -27,7 +27,7 @@ IFreeSql fsql = new FreeSql.FreeSqlBuilder() }) //监听SQL命令对象,在执行后 .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Examples/website/FreeSql.Site.UI/wwwroot/file/dbfirst.md b/Examples/website/FreeSql.Site.UI/wwwroot/file/dbfirst.md index e70b7a92..0c9f119a 100644 --- a/Examples/website/FreeSql.Site.UI/wwwroot/file/dbfirst.md +++ b/Examples/website/FreeSql.Site.UI/wwwroot/file/dbfirst.md @@ -33,7 +33,7 @@ var t2 = fsql.DbFirst.GetTablesByDatabase(fsql.DbFirst.GetDatabases()[0]); > 更多模板逐步开发中。。。 ```csharp -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(fsql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Examples/website/FreeSql.Site.UI/wwwroot/file/generator.md b/Examples/website/FreeSql.Site.UI/wwwroot/file/generator.md index c95c10a5..96c9adcf 100644 --- a/Examples/website/FreeSql.Site.UI/wwwroot/file/generator.md +++ b/Examples/website/FreeSql.Site.UI/wwwroot/file/generator.md @@ -18,7 +18,7 @@ var mysql = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/FreeSql.Extensions.EFCoreModelBuilder/FreeSql.Extensions.EFCoreModelBuilder.csproj b/FreeSql.Extensions.EFCoreModelBuilder/FreeSql.Extensions.EFCoreModelBuilder.csproj index efc6283c..e11ffc62 100644 --- a/FreeSql.Extensions.EFCoreModelBuilder/FreeSql.Extensions.EFCoreModelBuilder.csproj +++ b/FreeSql.Extensions.EFCoreModelBuilder/FreeSql.Extensions.EFCoreModelBuilder.csproj @@ -5,7 +5,7 @@ 0.0.12 FreeSql FreeSql - FreeSql ICodeFirst 扩展库,现实从 EFCore FluentAPI/Attribute 读取,从而做到无缝接入已使用 EFCore 项目开发。 + FreeSql ICodeFirst 扩展库,实现从 EFCore FluentAPI/Attribute 读取,从而做到无缝接入已使用 EFCore 项目开发。 https://github.com/2881099/FreeSql https://github.com/2881099/FreeSql diff --git a/FreeSql.Repository/BaseRepository.cs b/FreeSql.Repository/BaseRepository.cs index 75404ca5..59a180f2 100644 --- a/FreeSql.Repository/BaseRepository.cs +++ b/FreeSql.Repository/BaseRepository.cs @@ -46,7 +46,7 @@ namespace FreeSql { case DataType.Oracle: case DataType.Sqlite: default: - throw new NotImplementedException($"{_fsql.Ado.DataType}不支持类似returning或output类型的特性,请参考FreeSql插入数据的方法重新现实。"); + throw new NotImplementedException($"{_fsql.Ado.DataType}不支持类似returning或output类型的特性,请参考FreeSql插入数据的方法重新实现。"); } } @@ -60,7 +60,7 @@ namespace FreeSql { case DataType.Oracle: case DataType.Sqlite: default: - throw new NotImplementedException($"{_fsql.Ado.DataType}不支持类似returning或output类型的特性,请参考FreeSql插入数据的方法重新现实。"); + throw new NotImplementedException($"{_fsql.Ado.DataType}不支持类似returning或output类型的特性,请参考FreeSql插入数据的方法重新实现。"); } } @@ -74,7 +74,7 @@ namespace FreeSql { case DataType.Oracle: case DataType.Sqlite: default: - throw new NotImplementedException($"{_fsql.Ado.DataType}不支持类似returning或output类型的特性,请参考FreeSql插入数据的方法重新现实。"); + throw new NotImplementedException($"{_fsql.Ado.DataType}不支持类似returning或output类型的特性,请参考FreeSql插入数据的方法重新实现。"); } } @@ -88,7 +88,7 @@ namespace FreeSql { case DataType.Oracle: case DataType.Sqlite: default: - throw new NotImplementedException($"{_fsql.Ado.DataType}不支持类似returning或output类型的特性,请参考FreeSql插入数据的方法重新现实。"); + throw new NotImplementedException($"{_fsql.Ado.DataType}不支持类似returning或output类型的特性,请参考FreeSql插入数据的方法重新实现。"); } } diff --git a/FreeSql.Repository/FreeSql.Repository.csproj b/FreeSql.Repository/FreeSql.Repository.csproj index ec05f3d8..271b98df 100644 --- a/FreeSql.Repository/FreeSql.Repository.csproj +++ b/FreeSql.Repository/FreeSql.Repository.csproj @@ -4,7 +4,7 @@ netstandard2.0 0.1.7 YeXiangQin - FreeSql 通用仓库层现实,支持 MySql/SqlServer/PostgreSQL/Oracle/Sqlite 数据库。 + FreeSql 通用仓库层实现,支持 MySql/SqlServer/PostgreSQL/Oracle/Sqlite 数据库。 https://github.com/2881099/FreeSql FreeSql ORM Repository true diff --git a/FreeSql/FreeSqlBuilder.cs b/FreeSql/FreeSqlBuilder.cs index 6d382391..04765984 100644 --- a/FreeSql/FreeSqlBuilder.cs +++ b/FreeSql/FreeSqlBuilder.cs @@ -22,7 +22,7 @@ namespace FreeSql { /// /// 使用缓存,不指定默认使用内存 /// - /// 缓存现实 + /// 缓存实现 /// public FreeSqlBuilder UseCache(IDistributedCache cache) { _cache = cache; diff --git a/FreeSql/Internal/CommonExpression.cs b/FreeSql/Internal/CommonExpression.cs index 9deeb898..3b7b7885 100644 --- a/FreeSql/Internal/CommonExpression.cs +++ b/FreeSql/Internal/CommonExpression.cs @@ -297,7 +297,7 @@ namespace FreeSql.Internal { } var other3Exp = ExpressionLambdaToSqlOther(exp3, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); if (string.IsNullOrEmpty(other3Exp) == false) return other3Exp; - throw new Exception($"未现实函数表达式 {exp3} 解析"); + throw new Exception($"未实现函数表达式 {exp3} 解析"); case ExpressionType.MemberAccess: var exp4 = exp as MemberExpression; if (exp4.Expression != null && exp4.Expression.Type.IsArray == false && exp4.Expression.Type.IsNullableType()) return ExpressionLambdaToSql(exp4.Expression, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -380,7 +380,7 @@ namespace FreeSql.Internal { exp2 = expStack.Pop(); switch (exp2.NodeType) { case ExpressionType.Constant: - throw new NotImplementedException("未现实 MemberAccess 下的 Constant"); + throw new NotImplementedException("未实现 MemberAccess 下的 Constant"); case ExpressionType.Parameter: case ExpressionType.MemberAccess: diff --git a/FreeSql/Internal/CommonProvider/CacheProvider.cs b/FreeSql/Internal/CommonProvider/CacheProvider.cs index a64d80b6..e8c2260d 100644 --- a/FreeSql/Internal/CommonProvider/CacheProvider.cs +++ b/FreeSql/Internal/CommonProvider/CacheProvider.cs @@ -25,7 +25,7 @@ namespace FreeSql.Internal.CommonProvider { try { Cache.Remove($"{key1}|{key2}"); } catch { } // redis-cluster 不允许执行 multi keys 命令 CacheSupportMultiRemove = Cache.Get(key1) == null && cache.Get(key2) == null; if (CacheSupportMultiRemove == false) { - log.LogWarning("FreeSql Warning: 低性能, IDistributedCache 没现实批量删除缓存 Cache.Remove(\"key1|key2\")."); + log.LogWarning("FreeSql Warning: 低性能, IDistributedCache 没实现批量删除缓存 Cache.Remove(\"key1|key2\")."); Remove(key1, key2); } } @@ -99,7 +99,7 @@ namespace FreeSql.Internal.CommonProvider { public T Shell(string key, int timeoutSeconds, Func getData) { if (timeoutSeconds <= 0) return getData(); - if (Cache == null) throw new Exception("缓存现实 IDistributedCache 为 null"); + if (Cache == null) throw new Exception("缓存实现 IDistributedCache 为 null"); var cacheValue = Cache.Get(key); if (cacheValue != null) { try { @@ -117,7 +117,7 @@ namespace FreeSql.Internal.CommonProvider { public T Shell(string key, string field, int timeoutSeconds, Func getData) { if (timeoutSeconds <= 0) return getData(); - if (Cache == null) throw new Exception("缓存现实 IDistributedCache 为 null"); + if (Cache == null) throw new Exception("缓存实现 IDistributedCache 为 null"); var hashkey = $"{key}:{field}"; var cacheValue = Cache.Get(hashkey); if (cacheValue != null) { @@ -137,7 +137,7 @@ namespace FreeSql.Internal.CommonProvider { async public Task ShellAsync(string key, int timeoutSeconds, Func> getDataAsync) { if (timeoutSeconds <= 0) return await getDataAsync(); - if (Cache == null) throw new Exception("缓存现实 IDistributedCache 为 null"); + if (Cache == null) throw new Exception("缓存实现 IDistributedCache 为 null"); var cacheValue = await Cache.GetAsync(key); if (cacheValue != null) { try { @@ -155,7 +155,7 @@ namespace FreeSql.Internal.CommonProvider { async public Task ShellAsync(string key, string field, int timeoutSeconds, Func> getDataAsync) { if (timeoutSeconds <= 0) return await getDataAsync(); - if (Cache == null) throw new Exception("缓存现实 IDistributedCache 为 null"); + if (Cache == null) throw new Exception("缓存实现 IDistributedCache 为 null"); var hashkey = $"{key}:{field}"; var cacheValue = await Cache.GetAsync(hashkey); if (cacheValue != null) { diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs index 0579b1de..e7249116 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs @@ -39,7 +39,7 @@ namespace FreeSql.Internal.CommonProvider { case "InnerJoin": this.InternalJoin(expCall.Arguments[0], SelectTableInfoType.InnerJoin); break; case "RightJoin": this.InternalJoin(expCall.Arguments[0], SelectTableInfoType.RightJoin); break; - default: throw new NotImplementedException($"未现实 {expCall.Method.Name}"); + default: throw new NotImplementedException($"未实现 {expCall.Method.Name}"); } } } diff --git a/FreeSql/MySql/MySqlAdo/MygisTypes.cs b/FreeSql/MySql/MySqlAdo/MygisTypes.cs index 9350c17d..e412141a 100644 --- a/FreeSql/MySql/MySqlAdo/MygisTypes.cs +++ b/FreeSql/MySql/MySqlAdo/MygisTypes.cs @@ -61,7 +61,7 @@ public abstract class MygisGeometry { else if (wkt.StartsWith("multipoint", StringComparison.CurrentCultureIgnoreCase)) return new MygisMultiPoint(ParseLineString(wkt.Substring(10).Trim('(', ')'))); else if (wkt.StartsWith("multilinestring", StringComparison.CurrentCultureIgnoreCase)) return new MygisMultiLineString(ParseMultiLineString(wkt.Substring(15).Trim('(', ')'))); else if (wkt.StartsWith("multipolygon", StringComparison.CurrentCultureIgnoreCase)) return new MygisMultiPolygon(ParseMultiPolygon(wkt.Substring(12).Trim('(', ')'))); - throw new NotImplementedException($"MygisGeometry.Parse 未现实 \"{wkt}\""); + throw new NotImplementedException($"MygisGeometry.Parse 未实现 \"{wkt}\""); } static MygisPoint ParsePoint(string str) { var m = regexMygisPoint.Match(str); diff --git a/FreeSql/MySql/MySqlExpression.cs b/FreeSql/MySql/MySqlExpression.cs index 451f6e71..03db162e 100644 --- a/FreeSql/MySql/MySqlExpression.cs +++ b/FreeSql/MySql/MySqlExpression.cs @@ -187,7 +187,7 @@ namespace FreeSql.MySql { case "Equals": return $"({left} = {getExp(exp.Arguments[0])})"; } } - throw new Exception($"MySqlExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"MySqlExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallMath(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -213,7 +213,7 @@ namespace FreeSql.MySql { case "Atan2": return $"atan2({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})"; case "Truncate": return $"truncate({getExp(exp.Arguments[0])}, 0)"; } - throw new Exception($"MySqlExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"MySqlExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallDateTime(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -256,7 +256,7 @@ namespace FreeSql.MySql { case "ToString": return $"date_format({left}, '%Y-%m-%d %H:%i:%s.%f')"; } } - throw new Exception($"MySqlExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"MySqlExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallTimeSpan(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -286,7 +286,7 @@ namespace FreeSql.MySql { case "ToString": return $"cast({left} as char)"; } } - throw new Exception($"MySqlExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"MySqlExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallConvert(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -309,7 +309,7 @@ namespace FreeSql.MySql { case "ToUInt64": return $"cast({getExp(exp.Arguments[0])} as unsigned)"; } } - throw new Exception($"MySqlExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"MySqlExpression 未实现函数表达式 {exp} 解析"); } } } diff --git a/FreeSql/Oracle/OracleExpression.cs b/FreeSql/Oracle/OracleExpression.cs index 67b43b03..de021ad6 100644 --- a/FreeSql/Oracle/OracleExpression.cs +++ b/FreeSql/Oracle/OracleExpression.cs @@ -187,7 +187,7 @@ namespace FreeSql.Oracle { case "Equals": return $"({left} = {getExp(exp.Arguments[0])})"; } } - throw new Exception($"OracleExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"OracleExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallMath(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -214,7 +214,7 @@ namespace FreeSql.Oracle { //case "Atan2": return $"atan2({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})"; case "Truncate": return $"trunc({getExp(exp.Arguments[0])}, 0)"; } - throw new Exception($"OracleExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"OracleExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallDateTime(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -257,7 +257,7 @@ namespace FreeSql.Oracle { case "ToString": return $"to_char({left},'YYYY-MM-DD HH24:MI:SS.FF6')"; } } - throw new Exception($"OracleExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"OracleExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallTimeSpan(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -287,7 +287,7 @@ namespace FreeSql.Oracle { case "ToString": return $"to_char({left})"; } } - throw new Exception($"OracleExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"OracleExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallConvert(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -310,7 +310,7 @@ namespace FreeSql.Oracle { case "ToUInt64": return $"cast({getExp(exp.Arguments[0])} as number)"; } } - throw new Exception($"OracleExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"OracleExpression 未实现函数表达式 {exp} 解析"); } } } diff --git a/FreeSql/PostgreSQL/PostgreSQLExpression.cs b/FreeSql/PostgreSQL/PostgreSQLExpression.cs index 10d6a932..9f21568d 100644 --- a/FreeSql/PostgreSQL/PostgreSQLExpression.cs +++ b/FreeSql/PostgreSQL/PostgreSQLExpression.cs @@ -284,7 +284,7 @@ namespace FreeSql.PostgreSQL { case "Equals": return $"({left} = ({getExp(exp.Arguments[0])})::varchar)"; } } - throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"PostgreSQLExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallMath(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -310,7 +310,7 @@ namespace FreeSql.PostgreSQL { case "Atan2": return $"atan2({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})"; case "Truncate": return $"trunc({getExp(exp.Arguments[0])}, 0)"; } - throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"PostgreSQLExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallDateTime(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -353,7 +353,7 @@ namespace FreeSql.PostgreSQL { case "ToString": return $"to_char({left}, 'YYYY-MM-DD HH24:MI:SS.US')"; } } - throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"PostgreSQLExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallTimeSpan(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -383,7 +383,7 @@ namespace FreeSql.PostgreSQL { case "ToString": return $"({left})::varchar"; } } - throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"PostgreSQLExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallConvert(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -406,7 +406,7 @@ namespace FreeSql.PostgreSQL { case "ToUInt64": return $"({getExp(exp.Arguments[0])})::int8"; } } - throw new Exception($"PostgreSQLExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"PostgreSQLExpression 未实现函数表达式 {exp} 解析"); } } } diff --git a/FreeSql/SqlServer/SqlServerExpression.cs b/FreeSql/SqlServer/SqlServerExpression.cs index bb9e7e3f..7bfb924a 100644 --- a/FreeSql/SqlServer/SqlServerExpression.cs +++ b/FreeSql/SqlServer/SqlServerExpression.cs @@ -169,7 +169,7 @@ namespace FreeSql.SqlServer { case "Equals": return $"({left} = {getExp(exp.Arguments[0])})"; } } - throw new Exception($"SqlServerExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"SqlServerExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallMath(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -195,7 +195,7 @@ namespace FreeSql.SqlServer { case "Atan2": return $"atan2({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})"; case "Truncate": return $"floor({getExp(exp.Arguments[0])})"; } - throw new Exception($"SqlServerExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"SqlServerExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallDateTime(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -238,7 +238,7 @@ namespace FreeSql.SqlServer { case "ToString": return $"convert(varchar, {left}, 121)"; } } - throw new Exception($"SqlServerExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"SqlServerExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallTimeSpan(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -268,7 +268,7 @@ namespace FreeSql.SqlServer { case "ToString": return $"cast({left} as varchar)"; } } - throw new Exception($"SqlServerExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"SqlServerExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallConvert(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -291,7 +291,7 @@ namespace FreeSql.SqlServer { case "ToUInt64": return $"cast({getExp(exp.Arguments[0])} as bigint)"; } } - throw new Exception($"SqlServerExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"SqlServerExpression 未实现函数表达式 {exp} 解析"); } } } diff --git a/FreeSql/Sqlite/SqliteExpression.cs b/FreeSql/Sqlite/SqliteExpression.cs index a4efef98..62229156 100644 --- a/FreeSql/Sqlite/SqliteExpression.cs +++ b/FreeSql/Sqlite/SqliteExpression.cs @@ -192,7 +192,7 @@ namespace FreeSql.Sqlite { case "Equals": return $"({left} = {getExp(exp.Arguments[0])})"; } } - throw new Exception($"SqliteExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"SqliteExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallMath(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -218,7 +218,7 @@ namespace FreeSql.Sqlite { case "Atan2": return $"atan2({getExp(exp.Arguments[0])}, {getExp(exp.Arguments[1])})"; //case "Truncate": return $"truncate({getExp(exp.Arguments[0])}, 0)"; } - throw new Exception($"SqliteExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"SqliteExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallDateTime(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -261,7 +261,7 @@ namespace FreeSql.Sqlite { case "ToString": return $"strftime('%Y-%m-%d %H:%M.%f',{left})"; } } - throw new Exception($"SqliteExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"SqliteExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallTimeSpan(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -291,7 +291,7 @@ namespace FreeSql.Sqlite { case "ToString": return $"cast({left} as character)"; } } - throw new Exception($"SqliteExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"SqliteExpression 未实现函数表达式 {exp} 解析"); } internal override string ExpressionLambdaToSqlCallConvert(MethodCallExpression exp, List _tables, List _selectColumnMap, Func getSelectGroupingMapString, SelectTableInfoType tbtype, bool isQuoteName) { Func getExp = exparg => ExpressionLambdaToSql(exparg, _tables, _selectColumnMap, getSelectGroupingMapString, tbtype, isQuoteName); @@ -314,7 +314,7 @@ namespace FreeSql.Sqlite { case "ToUInt64": return $"cast({getExp(exp.Arguments[0])} as decimal(21,0))"; } } - throw new Exception($"SqliteExpression 未现实函数表达式 {exp} 解析"); + throw new Exception($"SqliteExpression 未实现函数表达式 {exp} 解析"); } } } diff --git a/Templates/MySql/rich-entity-navigation-object/readme.md b/Templates/MySql/rich-entity-navigation-object/readme.md index c95c10a5..96c9adcf 100644 --- a/Templates/MySql/rich-entity-navigation-object/readme.md +++ b/Templates/MySql/rich-entity-navigation-object/readme.md @@ -18,7 +18,7 @@ var mysql = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Templates/MySql/simple-entity-navigation-object/readme.md b/Templates/MySql/simple-entity-navigation-object/readme.md index c95c10a5..96c9adcf 100644 --- a/Templates/MySql/simple-entity-navigation-object/readme.md +++ b/Templates/MySql/simple-entity-navigation-object/readme.md @@ -18,7 +18,7 @@ var mysql = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Templates/MySql/simple-entity/readme.md b/Templates/MySql/simple-entity/readme.md index c95c10a5..96c9adcf 100644 --- a/Templates/MySql/simple-entity/readme.md +++ b/Templates/MySql/simple-entity/readme.md @@ -18,7 +18,7 @@ var mysql = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Templates/PostgreSQL/rich-entity-navigation-object/readme.md b/Templates/PostgreSQL/rich-entity-navigation-object/readme.md index c95c10a5..96c9adcf 100644 --- a/Templates/PostgreSQL/rich-entity-navigation-object/readme.md +++ b/Templates/PostgreSQL/rich-entity-navigation-object/readme.md @@ -18,7 +18,7 @@ var mysql = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Templates/PostgreSQL/simple-entity-navigation-object/readme.md b/Templates/PostgreSQL/simple-entity-navigation-object/readme.md index c95c10a5..96c9adcf 100644 --- a/Templates/PostgreSQL/simple-entity-navigation-object/readme.md +++ b/Templates/PostgreSQL/simple-entity-navigation-object/readme.md @@ -18,7 +18,7 @@ var mysql = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Templates/PostgreSQL/simple-entity/readme.md b/Templates/PostgreSQL/simple-entity/readme.md index c95c10a5..96c9adcf 100644 --- a/Templates/PostgreSQL/simple-entity/readme.md +++ b/Templates/PostgreSQL/simple-entity/readme.md @@ -18,7 +18,7 @@ var mysql = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Templates/SqlServer/rich-entity-navigation-object/readme.md b/Templates/SqlServer/rich-entity-navigation-object/readme.md index c95c10a5..96c9adcf 100644 --- a/Templates/SqlServer/rich-entity-navigation-object/readme.md +++ b/Templates/SqlServer/rich-entity-navigation-object/readme.md @@ -18,7 +18,7 @@ var mysql = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Templates/SqlServer/simple-entity-navigation-object/readme.md b/Templates/SqlServer/simple-entity-navigation-object/readme.md index c95c10a5..96c9adcf 100644 --- a/Templates/SqlServer/simple-entity-navigation-object/readme.md +++ b/Templates/SqlServer/simple-entity-navigation-object/readme.md @@ -18,7 +18,7 @@ var mysql = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载) diff --git a/Templates/SqlServer/simple-entity/readme.md b/Templates/SqlServer/simple-entity/readme.md index c95c10a5..96c9adcf 100644 --- a/Templates/SqlServer/simple-entity/readme.md +++ b/Templates/SqlServer/simple-entity/readme.md @@ -18,7 +18,7 @@ var mysql = new FreeSql.FreeSqlBuilder() .UseConnectionString(FreeSql.DataType.MySql, "Data Source=127.0.0.1;Port=3306;User ID=root;Password=root;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=10") .Build(); -//创建模板生成类现实 +//创建模板生成类实现 var gen = new FreeSql.Generator.TemplateGenerator(); gen.Build(mysql.DbFirst, @"C:\Users\28810\Desktop\github\FreeSql\Templates\MySql\simple-entity", //模板目录(事先下载)