tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 04:18:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

✨ support provider、Extensions Exceptions 多语言

Browse Source
This commit is contained in:
igeekfan
2022-06-10 03:05:27 +08:00
parent e9949b58ff
commit 4fa125e93c
128 changed files with 1369 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs
View File

@ -24,7 +24,7 @@ namespace FreeSql
static Func<IFreeSql> _resoleOrm;
internal static Func<IUnitOfWork> _resolveUow;
public static IFreeSql Orm => _resoleOrm?.Invoke() ?? throw new Exception("BaseEntity.Initialization 初始化错误，获取到 IFreeSql 是 null");
public static IFreeSql Orm => _resoleOrm?.Invoke() ?? throw new Exception(CoreStrings.S_BaseEntity_Initialization_Error);
public static void Initialization(IFreeSql fsql, Func<IUnitOfWork> resolveUow) => Initialization(() => fsql, resolveUow);
public static void Initialization(Func<IFreeSql> resoleOrm, Func<IUnitOfWork> resolveUow)

2
Extensions/FreeSql.Extensions.Linq/FreeSqlExtensionsLinq.cs
View File

@ -33,7 +33,7 @@ public static class FreeSqlExtensionsLinqSql
/// <returns></returns>
public static ISelect<T1> RestoreToSelect<T1>(this IQueryable<T1> that) where T1 : class
{
var queryable = that as QueryableProvider<T1, T1> ?? throw new Exception($"无法将 IQueryable<{typeof(T1).Name}> 转换为 ISelect<{typeof(T1).Name}>，因为他的实现不是 FreeSql.Extensions.Linq.QueryableProvider");
var queryable = that as QueryableProvider<T1, T1> ?? throw new Exception(CoreStrings.S_CannotBeConverted_To_ISelect(typeof(T1).Name));
return queryable._select;
}

16
Extensions/FreeSql.Extensions.Linq/QueryableProvider.cs
View File

@ -121,7 +121,7 @@ namespace FreeSql.Extensions.Linq
case "Average": return tplMaxMinAvgSum("Avg");
case "Concat":
return throwCallExp(" 不支持");
return throwCallExp(CoreStrings.Not_Support);
case "Contains":
if (callExp.Arguments.Count == 2)
{
@ -141,7 +141,7 @@ namespace FreeSql.Extensions.Linq
_select.Distinct();
break;
}
return throwCallExp(" 不支持");
return throwCallExp(CoreStrings.Not_Support);
case "ElementAt":
case "ElementAtOrDefault":
@ -178,7 +178,7 @@ namespace FreeSql.Extensions.Linq
_select.InternalWhere(whereParam);
break;
}
return throwCallExp(" 不支持");
return throwCallExp(CoreStrings.Not_Support);
case "Skip":
_select.Offset((int)callExp.Arguments[1].GetConstExprValue());
@ -190,7 +190,7 @@ namespace FreeSql.Extensions.Linq
case "ToList":
if (callExp.Arguments.Count == 1)
return _select.ToList();
return throwCallExp(" 不支持");
return throwCallExp(CoreStrings.Not_Support);
case "Select":
var selectParam = (callExp.Arguments[1] as UnaryExpression)?.Operand as LambdaExpression;
@ -199,7 +199,7 @@ namespace FreeSql.Extensions.Linq
_select._selectExpression = selectParam;
break;
}
return throwCallExp(" 不支持");
return throwCallExp(CoreStrings.Not_Support);
case "Join":
if (callExp.Arguments.Count == 5)
@ -241,13 +241,13 @@ namespace FreeSql.Extensions.Linq
case "Last":
case "LastOrDefault":
return throwCallExp(" 不支持");
return throwCallExp(CoreStrings.Not_Support);
case "GroupBy":
return throwCallExp(" 不支持");
return throwCallExp(CoreStrings.Not_Support);
default:
return throwCallExp(" 不支持");
return throwCallExp(CoreStrings.Not_Support);
}
}
if (tresult == null) return null;

11
Extensions/FreeSql.Generator/ConsoleApp.cs
View File

@ -159,7 +159,7 @@ new Colorful.Formatter("推荐在实体类目录创建 gen.bat，双击它重新
case "-nameoptions":
ArgsNameOptions = args[a + 1].Split(',').Select(opt => opt == "1").ToArray();
if (ArgsNameOptions.Length != 4) throw new ArgumentException("-NameOptions 参数错误，格式为：0,0,0,0");
if (ArgsNameOptions.Length != 4) throw new ArgumentException(CoreStrings.S_NameOptions_Incorrect);
a++;
break;
case "-namespace":
@ -168,7 +168,8 @@ new Colorful.Formatter("推荐在实体类目录创建 gen.bat，双击它重新
break;
case "-db":
var dbargs = args[a + 1].Split(',', 2);
if (dbargs.Length != 2) throw new ArgumentException("-DB 参数错误，格式为：MySql,ConnectionString");
if (dbargs.Length != 2) throw new ArgumentException(CoreStrings.S_DB_ParameterError);
switch (dbargs[0].Trim().ToLower())
{
case "mysql": ArgsDbType = DataType.MySql; break;
@ -181,7 +182,7 @@ new Colorful.Formatter("推荐在实体类目录创建 gen.bat，双击它重新
case "kingbasees": ArgsDbType = DataType.KingbaseES; break;
case "shentong": ArgsDbType = DataType.ShenTong; break;
case "clickhouse": ArgsDbType = DataType.ClickHouse; break;
default: throw new ArgumentException($"-DB 参数错误，不支持的类型：\"{dbargs[0]}\"");
default: throw new ArgumentException(CoreStrings.S_DB_ParameterError_UnsupportedType(dbargs[0]));
}
ArgsConnectionString = dbargs[1].Trim();
a++;
@ -208,11 +209,11 @@ new Colorful.Formatter("推荐在实体类目录创建 gen.bat，双击它重新
a++;
break;
default:
throw new ArgumentException($"错误的参数设置：{args[a]}");
throw new ArgumentException(CoreStrings.S_WrongParameter(args[a]));
}
}
if (string.IsNullOrEmpty(ArgsConnectionString)) throw new ArgumentException($"-DB 参数错误，未提供 ConnectionString");
if (string.IsNullOrEmpty(ArgsConnectionString)) throw new ArgumentException(CoreStrings.S_DB_Parameter_Error_NoConnectionString);
RazorEngine.Engine.Razor = RazorEngineService.Create(new RazorEngine.Configuration.TemplateServiceConfiguration
{