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

4
Providers/FreeSql.Provider.MsAccess/Curd/MsAccessDelete.cs
View File

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

2
Providers/FreeSql.Provider.MsAccess/Curd/MsAccessInsert.cs
View File

@ -26,7 +26,7 @@ namespace FreeSql.MsAccess.Curd
public override List<T1> ExecuteInserted() => base.SplitExecuteInserted(1, 1000);
public override IInsert<T1> BatchOptions(int valuesLimit, int parameterLimit, bool autoTransaction = true) =>
throw new NotImplementedException("蛋疼的 access 插入只能一条一条执行，不支持 values(..),(..) 也不支持 select .. UNION ALL select ..");
throw new NotImplementedException(CoreStrings.S_Access_InsertOnlyOneAtTime);
protected override int RawExecuteAffrows()
{

2
Providers/FreeSql.Provider.MsAccess/Curd/MsAccessSelect.cs
View File

@ -36,7 +36,7 @@ namespace FreeSql.MsAccess.Curd
if (_limit > 0) sb.Append("TOP ").Append(_skip + _limit).Append(" ");
sb.Append(field);
if (_skip > 0)
throw new NotImplementedException("FreeSql.Provider.MsAccess 未实现 Skip/Offset 功能，如果需要分页请使用判断上一次 id");
throw new NotImplementedException(CoreStrings.S_NotImplementSkipOffset("MsAccess"));
sb.Append(" \r\nFROM ");
var fromIndex = sb.Length;
var ioinCounter = 0;

6
Providers/FreeSql.Provider.MsAccess/Curd/MsAccessUpdate.cs
View File

@ -25,9 +25,9 @@ namespace FreeSql.MsAccess.Curd
public override List<T1> ExecuteUpdated() => base.SplitExecuteUpdated(1, 1000);
public override IUpdate<T1> BatchOptions(int rowsLimit, int parameterLimit, bool autoTransaction = true) =>
throw new NotImplementedException("蛋疼的 access 插入只能一条一条执行，不支持 values(..),(..) 也不支持 select .. UNION ALL select ..");
throw new NotImplementedException(CoreStrings.S_Access_InsertOnlyOneAtTime);
protected override List<T1> RawExecuteUpdated() => throw new NotImplementedException("FreeSql.Provider.MsAccess 未实现该功能");
protected override List<T1> RawExecuteUpdated() => throw new NotImplementedException($"FreeSql.Provider.MsAccess {CoreStrings.S_Not_Implemented_Feature}");
protected override void ToSqlCase(StringBuilder caseWhen, ColumnInfo[] primarys)
{
@ -69,7 +69,7 @@ namespace FreeSql.MsAccess.Curd
public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default) => base.SplitExecuteAffrowsAsync(1, 1000, cancellationToken);
public override Task<List<T1>> ExecuteUpdatedAsync(CancellationToken cancellationToken = default) => base.SplitExecuteUpdatedAsync(1, 1000, cancellationToken);
protected override Task<List<T1>> RawExecuteUpdatedAsync(CancellationToken cancellationToken = default) => throw new NotImplementedException("FreeSql.Provider.MsAccess 未实现该功能");
protected override Task<List<T1>> RawExecuteUpdatedAsync(CancellationToken cancellationToken = default) => throw new NotImplementedException($"FreeSql.Provider.MsAccess {CoreStrings.S_Not_Implemented_Feature}");
#endif
}
}

4
Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessAdo.cs
View File

@ -23,12 +23,12 @@ namespace FreeSql.MsAccess
return;
}
if (!string.IsNullOrEmpty(masterConnectionString))
MasterPool = new MsAccessConnectionPool("主库", masterConnectionString, null, null);
MasterPool = new MsAccessConnectionPool(CoreStrings.S_MasterDatabase, masterConnectionString, null, null);
if (slaveConnectionStrings != null)
{
foreach (var slaveConnectionString in slaveConnectionStrings)
{
var slavePool = new MsAccessConnectionPool($"从库{SlavePools.Count + 1}", slaveConnectionString, () => Interlocked.Decrement(ref slaveUnavailables), () => Interlocked.Increment(ref slaveUnavailables));
var slavePool = new MsAccessConnectionPool($"{CoreStrings.S_SlaveDatabase}{SlavePools.Count + 1}", slaveConnectionString, () => Interlocked.Decrement(ref slaveUnavailables), () => Interlocked.Increment(ref slaveUnavailables));
SlavePools.Add(slavePool);
}
}

10
Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs
View File

@ -45,7 +45,7 @@ namespace FreeSql.MsAccess
{
internal MsAccessConnectionPool _pool;
public string Name { get; set; } = "Microsoft Access OleDbConnection 对象池";
public string Name { get; set; } = $"Microsoft Access OleDbConnection {CoreStrings.S_ObjectPool}";
public int PoolSize { get; set; } = 100;
public TimeSpan SyncGetTimeout { get; set; } = TimeSpan.FromSeconds(30);
public TimeSpan IdleTimeout { get; set; } = TimeSpan.Zero;
@ -120,8 +120,8 @@ namespace FreeSql.MsAccess
if (obj.Value == null)
{
_pool.SetUnavailable(new Exception("连接字符串错误"), obj.LastGetTimeCopy);
throw new Exception($"【{this.Name}】连接字符串错误，请检查。");
_pool.SetUnavailable(new Exception(CoreStrings.S_ConnectionStringError), obj.LastGetTimeCopy);
throw new Exception(CoreStrings.S_ConnectionStringError_Check(this.Name));
}
if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && obj.Value.Ping() == false)
@ -151,8 +151,8 @@ namespace FreeSql.MsAccess
if (obj.Value == null)
{
_pool.SetUnavailable(new Exception("连接字符串错误"), obj.LastGetTimeCopy);
throw new Exception($"【{this.Name}】连接字符串错误，请检查。");
_pool.SetUnavailable(new Exception(CoreStrings.S_ConnectionStringError), obj.LastGetTimeCopy);
throw new Exception(CoreStrings.S_ConnectionStringError_Check(this.Name));
}
if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && (await obj.Value.PingAsync()) == false)

9
Providers/FreeSql.Provider.MsAccess/MsAccessCodeFirst.cs
View File

@ -80,8 +80,8 @@ namespace FreeSql.MsAccess
{
if (sb.Length > 0) sb.Append("\r\n");
var tb = _commonUtils.GetTableByEntity(obj.entityType);
if (tb == null) throw new Exception($"类型 {obj.entityType.FullName} 不可迁移");
if (tb.Columns.Any() == false) throw new Exception($"类型 {obj.entityType.FullName} 不可迁移，可迁移属性0个");
if (tb == null) throw new Exception(CoreStrings.S_Type_IsNot_Migrable(obj.entityType.FullName));
if (tb.Columns.Any() == false) throw new Exception(CoreStrings.S_Type_IsNot_Migrable_0Attributes(obj.entityType.FullName));
var tbname = tb.DbName;
var tboldname = tb.DbOldName; //旧表名
if (string.Compare(tbname, tboldname, true) == 0) tboldname = null;
@ -177,7 +177,7 @@ namespace FreeSql.MsAccess
istmpatler = true;
}
if (tboldname != null && isexistsTb == true)
throw new Exception($"旧表(OldName)：{tboldname} 存在，数据库已存在 {tbname} 表，无法改名");
throw new Exception(CoreStrings.S_OldTableExists(tboldname, tbname));
DataTable schemaColumns = null;
DataTable schemaDataTypes = null;
@ -394,7 +394,8 @@ namespace FreeSql.MsAccess
}
Dictionary<string, bool> dicDropTable = new Dictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
Action<string> dropTable = tn => {
Action<string> dropTable = tn =>
{
if (dicDropTable.ContainsKey(tn)) return;
dicDropTable.Add(tn, true);
sb.Append("DROP TABLE ").Append(_commonUtils.QuoteSqlName(tn)).Append(";\r\n");

2
Providers/FreeSql.Provider.MsAccess/MsAccessProvider.cs
View File

@ -15,7 +15,7 @@ namespace FreeSql.MsAccess
public override IDelete<T1> CreateDeleteProvider<T1>(object dywhere) => new MsAccessDelete<T1>(this, this.InternalCommonUtils, this.InternalCommonExpression, dywhere);
public override IInsertOrUpdate<T1> CreateInsertOrUpdateProvider<T1>() => throw new NotImplementedException();
public override IDbFirst DbFirst => throw new NotImplementedException("FreeSql.Provider.MsAccess 未实现该功能");
public override IDbFirst DbFirst => throw new NotImplementedException($"FreeSql.Provider.MsAccess {CoreStrings.S_Not_Implemented_Feature}");
public MsAccessProvider(string masterConnectionString, string[] slaveConnectionString, Func<DbConnection> connectionFactory = null)
{
this.InternalCommonUtils = new MsAccessUtils(this);