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

- 增加 Where In 表达式解析；

Browse Source 
- 增加 FreeSqlBuilder.UseConnectionFactory 自定义数据库连接对象的创建方法；
This commit is contained in:
28810
2019-12-17 01:39:53 +08:00
parent 51494c31a2
commit e1e3e4a3b2
57 changed files with 1018 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleAdo.cs
View File

@ -12,10 +12,15 @@ namespace FreeSql.Odbc.Oracle
{
class OdbcOracleAdo : FreeSql.Internal.CommonProvider.AdoProvider
{
public OdbcOracleAdo() : base(DataType.Oracle) { }
public OdbcOracleAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings) : base(DataType.Oracle)
public OdbcOracleAdo() : base(DataType.OdbcOracle) { }
public OdbcOracleAdo(CommonUtils util, string masterConnectionString, string[] slaveConnectionStrings, Func<DbConnection> connectionFactory) : base(DataType.OdbcOracle)
{
base._util = util;
if (connectionFactory != null)
{
MasterPool = new FreeSql.Internal.CommonProvider.DbConnectionPool(DataType.OdbcOracle, connectionFactory);
return;
}
if (!string.IsNullOrEmpty(masterConnectionString))
MasterPool = new OdbcOracleConnectionPool("主库", masterConnectionString, null, null);
if (slaveConnectionStrings != null)
@ -57,9 +62,11 @@ namespace FreeSql.Odbc.Oracle
return new OdbcCommand();
}
protected override void ReturnConnection(ObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
protected override void ReturnConnection(IObjectPool<DbConnection> pool, Object<DbConnection> conn, Exception ex)
{
(pool as OdbcOracleConnectionPool).Return(conn, ex);
var rawPool = pool as OdbcOracleConnectionPool;
if (rawPool != null) rawPool.Return(conn, ex);
else pool.Return(conn);
}
protected override DbParameter[] GetDbParamtersByObject(string sql, object obj) => _util.GetDbParamtersByObject(sql, obj);

11
Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs
View File

@ -21,9 +21,7 @@ namespace FreeSql.Odbc.Oracle
public OdbcOracleConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
{
var userIdMatch = Regex.Match(connectionString, @"(User\s+Id|Uid)\s*=\s*([^;]+)", RegexOptions.IgnoreCase);
if (userIdMatch.Success == false) throw new Exception(@"从 ConnectionString 中无法匹配 (User\s+Id|Uid)\s*=\s*([^;]+)");
this.UserId = userIdMatch.Groups[2].Value.Trim().ToUpper();
this.UserId = OdbcOracleConnectionPool.GetUserId(connectionString);
var policy = new OdbcOracleConnectionPoolPolicy
{
@ -37,6 +35,13 @@ namespace FreeSql.Odbc.Oracle
this.unavailableHandler = unavailableHandler;
}
public static string GetUserId(string connectionString)
{
var userIdMatch = Regex.Match(connectionString, @"(User\s+Id|Uid)\s*=\s*([^;]+)", RegexOptions.IgnoreCase);
if (userIdMatch.Success == false) throw new Exception(@"从 ConnectionString 中无法匹配 (User\s+Id|Uid)\s*=\s*([^;]+)");
return userIdMatch.Groups[2].Value.Trim().ToUpper();
}
public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
{
if (exception != null && exception is OdbcException)

7
Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleCodeFirst.cs
View File

@ -77,7 +77,12 @@ namespace FreeSql.Odbc.Oracle
protected override string GetComparisonDDLStatements(params (Type entityType, string tableName)[] objects)
{
var userId = (_orm.Ado.MasterPool as OdbcOracleConnectionPool).UserId;
var userId = (_orm.Ado.MasterPool as OdbcOracleConnectionPool)?.UserId;
if (string.IsNullOrEmpty(userId))
using (var conn = _orm.Ado.MasterPool.Get())
{
userId = OdbcOracleConnectionPool.GetUserId(conn.Value.ConnectionString);
}
var seqcols = new List<(ColumnInfo, string[], bool)>(); //序列：列，表，自增
var seqnameDel = new List<string>(); //要删除的序列+触发器

4
Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleProvider.cs
View File

@ -28,12 +28,12 @@ namespace FreeSql.Odbc.Oracle
public IAop Aop { get; }
public ICodeFirst CodeFirst { get; }
public IDbFirst DbFirst { get; }
public OdbcOracleProvider(string masterConnectionString, string[] slaveConnectionString)
public OdbcOracleProvider(string masterConnectionString, string[] slaveConnectionString, Func<DbConnection> connectionFactory = null)
{
this.InternalCommonUtils = new OdbcOracleUtils(this);
this.InternalCommonExpression = new OdbcOracleExpression(this.InternalCommonUtils);
this.Ado = new OdbcOracleAdo(this.InternalCommonUtils, masterConnectionString, slaveConnectionString);
this.Ado = new OdbcOracleAdo(this.InternalCommonUtils, masterConnectionString, slaveConnectionString, connectionFactory);
this.Aop = new AopProvider();
this.DbFirst = new OdbcOracleDbFirst(this, this.InternalCommonUtils, this.InternalCommonExpression);