weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-14 04:10:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

处理CoreErrorStrings

Browse Source
This commit is contained in:
d4ilys
2024-11-30 11:22:16 +08:00
parent 6266827d11
commit c194f352aa
8 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
FreeSql/FreeSqlBuilder.cs
View File

@@ -385,6 +385,11 @@ namespace FreeSql
if (type == null) throwNotFind("FreeSql.Provider.Duckdb.dll", "FreeSql.Duckdb.DuckdbProvider<>"); if (type == null) throwNotFind("FreeSql.Provider.Duckdb.dll", "FreeSql.Duckdb.DuckdbProvider<>");
break; break;
case DataType.TDengine:
type = Type.GetType("FreeSql.TDengine.TDengineProvider`1,FreeSql.Provider.TDengine")?.MakeGenericType(typeof(TMark));
if (type == null) throwNotFind("FreeSql.Provider.TDengine.dll", "FreeSql.TDengine.TDengineProvider<>");
break;
default: throw new Exception(CoreErrorStrings.NotSpecified_UseConnectionString_UseConnectionFactory); default: throw new Exception(CoreErrorStrings.NotSpecified_UseConnectionString_UseConnectionFactory);
} }
} }

4
Providers/FreeSql.Provider.TDengine/Curd/TDengineDelete.cs
View File

@@ -16,11 +16,11 @@ namespace FreeSql.TDengine.Curd
{ {
} }
public override List<T1> ExecuteDeleted() => throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); public override List<T1> ExecuteDeleted() => throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
#if net40 #if net40
#else #else
public override Task<List<T1>> ExecuteDeletedAsync(CancellationToken cancellationToken = default) => throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); public override Task<List<T1>> ExecuteDeletedAsync(CancellationToken cancellationToken = default) => throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
#endif #endif
} }
} }

8
Providers/FreeSql.Provider.TDengine/TDengineAdo/TDengineAdo.cs
View File

@@ -32,16 +32,16 @@ namespace FreeSql.TDengine
if (isAdoPool) masterConnectionString = masterConnectionString.Substring("AdoConnectionPool,".Length); if (isAdoPool) masterConnectionString = masterConnectionString.Substring("AdoConnectionPool,".Length);
if (!string.IsNullOrEmpty(masterConnectionString)) if (!string.IsNullOrEmpty(masterConnectionString))
MasterPool = isAdoPool MasterPool = isAdoPool
? new DbConnectionStringPool(base.DataType, CoreStrings.S_MasterDatabase, ? new DbConnectionStringPool(base.DataType, CoreErrorStrings.S_MasterDatabase,
() => new TDengineConnection(masterConnectionString)) as IObjectPool<DbConnection> () => new TDengineConnection(masterConnectionString)) as IObjectPool<DbConnection>
: new TDengineConnectionPool(CoreStrings.S_MasterDatabase, masterConnectionString, null, null); : new TDengineConnectionPool(CoreErrorStrings.S_MasterDatabase, masterConnectionString, null, null);
slaveConnectionStrings?.ToList().ForEach(slaveConnectionString => slaveConnectionStrings?.ToList().ForEach(slaveConnectionString =>
{ {
var slavePool = isAdoPool var slavePool = isAdoPool
? new DbConnectionStringPool(base.DataType, $"{CoreStrings.S_SlaveDatabase}{SlavePools.Count + 1}", ? new DbConnectionStringPool(base.DataType, $"{CoreErrorStrings.S_SlaveDatabase}{SlavePools.Count + 1}",
() => new TDengineConnection(slaveConnectionString)) as IObjectPool<DbConnection> () => new TDengineConnection(slaveConnectionString)) as IObjectPool<DbConnection>
: new TDengineConnectionPool($"{CoreStrings.S_SlaveDatabase}{SlavePools.Count + 1}", : new TDengineConnectionPool($"{CoreErrorStrings.S_SlaveDatabase}{SlavePools.Count + 1}",
slaveConnectionString, () => Interlocked.Decrement(ref slaveUnavailables), slaveConnectionString, () => Interlocked.Decrement(ref slaveUnavailables),
() => Interlocked.Increment(ref slaveUnavailables)); () => Interlocked.Increment(ref slaveUnavailables));
SlavePools.Add(slavePool); SlavePools.Add(slavePool);

10
Providers/FreeSql.Provider.TDengine/TDengineAdo/TDengineConnectionPool.cs
View File

@@ -40,7 +40,7 @@ namespace FreeSql.TDengine
internal class TDengineConnectionPoolPolicy : IPolicy<DbConnection> internal class TDengineConnectionPoolPolicy : IPolicy<DbConnection>
{ {
internal TDengineConnectionPool InternalPool; internal TDengineConnectionPool InternalPool;
public string Name { get; set; } = $"TDengine Connection {CoreStrings.S_ObjectPool}"; public string Name { get; set; } = $"TDengine Connection {CoreErrorStrings.S_ObjectPool}";
public int PoolSize { get; set; } = 50; public int PoolSize { get; set; } = 50;
public TimeSpan SyncGetTimeout { get; set; } = TimeSpan.FromSeconds(10); public TimeSpan SyncGetTimeout { get; set; } = TimeSpan.FromSeconds(10);
public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20); public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
@@ -117,9 +117,9 @@ namespace FreeSql.TDengine
{ {
if (obj.Value == null) if (obj.Value == null)
{ {
InternalPool.SetUnavailable(new Exception(CoreStrings.S_ConnectionStringError), InternalPool.SetUnavailable(new Exception(CoreErrorStrings.S_ConnectionStringError),
obj.LastGetTimeCopy); obj.LastGetTimeCopy);
throw new Exception(CoreStrings.S_ConnectionStringError_Check(this.Name)); throw new Exception(CoreErrorStrings.S_ConnectionStringError_Check(this.Name));
} }
if (obj.Value.State != ConnectionState.Open || if (obj.Value.State != ConnectionState.Open ||
@@ -147,9 +147,9 @@ namespace FreeSql.TDengine
{ {
if (obj.Value == null) if (obj.Value == null)
{ {
InternalPool.SetUnavailable(new Exception(CoreStrings.S_ConnectionStringError), InternalPool.SetUnavailable(new Exception(CoreErrorStrings.S_ConnectionStringError),
obj.LastGetTimeCopy); obj.LastGetTimeCopy);
throw new Exception(CoreStrings.S_ConnectionStringError_Check(this.Name)); throw new Exception(CoreErrorStrings.S_ConnectionStringError_Check(this.Name));
} }
if (obj.Value.State != ConnectionState.Open || if (obj.Value.State != ConnectionState.Open ||

4
Providers/FreeSql.Provider.TDengine/TDengineCodeFirst.cs
View File

@@ -86,10 +86,10 @@ namespace FreeSql.TDengine
if (sb.Length > 0) sb.Append(Environment.NewLine); if (sb.Length > 0) sb.Append(Environment.NewLine);
var tb = obj.tableSchema; var tb = obj.tableSchema;
if (tb == null) if (tb == null)
throw new Exception(CoreStrings.S_Type_IsNot_Migrable(obj.tableSchema.Type.FullName)); throw new Exception(CoreErrorStrings.S_Type_IsNot_Migrable(obj.tableSchema.Type.FullName));
if (tb.Columns.Any() == false) if (tb.Columns.Any() == false)
throw new Exception( throw new Exception(
CoreStrings.S_Type_IsNot_Migrable_0Attributes(obj.tableSchema.Type.FullName)); CoreErrorStrings.S_Type_IsNot_Migrable_0Attributes(obj.tableSchema.Type.FullName));
var tbName = _commonUtils.SplitTableName(tb.DbName).First(); var tbName = _commonUtils.SplitTableName(tb.DbName).First();

20
Providers/FreeSql.Provider.TDengine/TDengineDbFirst.cs
View File

@@ -32,12 +32,12 @@ namespace FreeSql.TDengine
public List<DbTableInfo> GetTablesByDatabase(params string[] database) public List<DbTableInfo> GetTablesByDatabase(params string[] database)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
} }
public DbTableInfo GetTableByName(string name, bool ignoreCase = true) public DbTableInfo GetTableByName(string name, bool ignoreCase = true)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
} }
public bool ExistsTable(string name, bool ignoreCase = true) public bool ExistsTable(string name, bool ignoreCase = true)
@@ -80,7 +80,7 @@ namespace FreeSql.TDengine
public string GetCsConvert(DbColumnInfo column) public string GetCsConvert(DbColumnInfo column)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
//return _dicDbToCs.TryGetValue(column.DbType, out var trydc) //return _dicDbToCs.TryGetValue(column.DbType, out var trydc)
// ? (column.IsNullable ? trydc.csConvert : trydc.csConvert.Replace("?", "")) // ? (column.IsNullable ? trydc.csConvert : trydc.csConvert.Replace("?", ""))
// : null; // : null;
@@ -88,20 +88,20 @@ namespace FreeSql.TDengine
public string GetCsParse(DbColumnInfo column) public string GetCsParse(DbColumnInfo column)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
//return _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csParse : null; //return _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csParse : null;
} }
public string GetCsStringify(DbColumnInfo column) public string GetCsStringify(DbColumnInfo column)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
//return _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csStringify : null; //return _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csStringify : null;
} }
public string GetCsType(DbColumnInfo column) public string GetCsType(DbColumnInfo column)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
//return _dicDbToCs.TryGetValue(column.DbType, out var trydc) //return _dicDbToCs.TryGetValue(column.DbType, out var trydc)
// ? (column.IsNullable ? trydc.csType : trydc.csType.Replace("?", "")) // ? (column.IsNullable ? trydc.csType : trydc.csType.Replace("?", ""))
// : null; // : null;
@@ -109,26 +109,26 @@ namespace FreeSql.TDengine
public Type GetCsTypeInfo(DbColumnInfo column) public Type GetCsTypeInfo(DbColumnInfo column)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
//return _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csTypeInfo : null; //return _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csTypeInfo : null;
} }
public string GetCsTypeValue(DbColumnInfo column) public string GetCsTypeValue(DbColumnInfo column)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
//return _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csTypeValue : null; //return _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csTypeValue : null;
} }
public string GetDataReaderMethod(DbColumnInfo column) public string GetDataReaderMethod(DbColumnInfo column)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
//return _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.dataReaderMethod : null; //return _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.dataReaderMethod : null;
} }
public List<DbEnumInfo> GetEnumsByDatabase(params string[] database) public List<DbEnumInfo> GetEnumsByDatabase(params string[] database)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
} }
} }
} }

2
Providers/FreeSql.Provider.TDengine/TDengineExpression.cs
View File

@@ -314,7 +314,7 @@ namespace FreeSql.TDengine
return _common.StringConcat(concatNewArrExp.Expressions.Select(a => getExp(a)).ToArray(), null); return _common.StringConcat(concatNewArrExp.Expressions.Select(a => getExp(a)).ToArray(), null);
return _common.StringConcat(exp.Arguments.Select(a => getExp(a)).ToArray(), null); return _common.StringConcat(exp.Arguments.Select(a => getExp(a)).ToArray(), null);
case "Format": case "Format":
if (exp.Arguments[0].NodeType != ExpressionType.Constant) throw new Exception(CoreStrings.Not_Implemented_Expression_ParameterUseConstant(exp, exp.Arguments[0])); if (exp.Arguments[0].NodeType != ExpressionType.Constant) throw new Exception(CoreErrorStrings.Not_Implemented_Expression_ParameterUseConstant(exp, exp.Arguments[0]));
var expArgsHack = exp.Arguments.Count == 2 && exp.Arguments[1].NodeType == ExpressionType.NewArrayInit ? var expArgsHack = exp.Arguments.Count == 2 && exp.Arguments[1].NodeType == ExpressionType.NewArrayInit ?
(exp.Arguments[1] as NewArrayExpression).Expressions : exp.Arguments.Where((a, z) => z > 0); (exp.Arguments[1] as NewArrayExpression).Expressions : exp.Arguments.Where((a, z) => z > 0);
//3个 {} 时，Arguments 解析出来是分开的 //3个 {} 时，Arguments 解析出来是分开的

4
Providers/FreeSql.Provider.TDengine/TDengineProvider.cs
View File

@@ -75,7 +75,7 @@ namespace FreeSql.TDengine
public override IUpdate<T1> CreateUpdateProvider<T1>(object dywhere) public override IUpdate<T1> CreateUpdateProvider<T1>(object dywhere)
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
} }
public override IDelete<T1> CreateDeleteProvider<T1>(object dywhere) public override IDelete<T1> CreateDeleteProvider<T1>(object dywhere)
@@ -85,7 +85,7 @@ namespace FreeSql.TDengine
public override IInsertOrUpdate<T1> CreateInsertOrUpdateProvider<T1>() public override IInsertOrUpdate<T1> CreateInsertOrUpdateProvider<T1>()
{ {
throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreStrings.S_Not_Implemented_Feature}"); throw new NotImplementedException($"FreeSql.Provider.TDengine {CoreErrorStrings.S_Not_Implemented_Feature}");
} }
~TDengineProvider() => this.Dispose(); ~TDengineProvider() => this.Dispose();