weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-23 16:50:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 恢复 MySql8.0.30 ExecuteInserted/ExecuteUpdated/ExecuteDeleted 的适配改动；#2001

Browse Source
This commit is contained in:
2881099
2025-03-31 16:51:23 +08:00
parent 1fcda96b5b
commit 66d94d0a88
12 changed files with 148 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlDelete.cs
View File

@@ -24,9 +24,6 @@ namespace FreeSql.Odbc.MySql
var ret = new List<T1>();
DbParameter[] dbParms = null;
StringBuilder sbret = null;
var queryType = _table.TypeLazy ?? _table.Type;
int[] queryIndexs = null;
var queryFlag = "";
ToSqlFetch(sb =>
{
if (dbParms == null)
@@ -36,31 +33,21 @@ namespace FreeSql.Odbc.MySql
sbret.Append(" RETURNING ");
var colidx = 0;
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in _table.Columns.Values)
{
if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
dic.Add(col.CsName, colidx);
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
++colidx;
}
queryIndexs = AdoProvider.GetQueryTypeProperties(queryType).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray();
queryFlag = sbflag.ToString();
}
var sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null;
try
{
_orm.Ado.ExecuteReader(_connection, _transaction, fetch =>
{
ret.Add((T1)Utils.ExecuteReaderToClass(queryFlag, queryType, queryIndexs, fetch.Object, 0, _commonUtils));
}, CommandType.Text, sql, _commandTimeout, dbParms);
ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms));
}
catch (Exception ex)
{
@@ -73,7 +60,11 @@ namespace FreeSql.Odbc.MySql
_orm.Aop.CurdAfterHandler?.Invoke(this, after);
}
});
sbret?.Clear();
if (dbParms != null)
{
this.ClearData();
sbret.Clear();
}
return ret;
}
@@ -84,9 +75,6 @@ namespace FreeSql.Odbc.MySql
var ret = new List<T1>();
DbParameter[] dbParms = null;
StringBuilder sbret = null;
var queryType = _table.TypeLazy ?? _table.Type;
int[] queryIndexs = null;
var queryFlag = "";
await ToSqlFetchAsync(async sb =>
{
if (dbParms == null)
@@ -96,32 +84,21 @@ namespace FreeSql.Odbc.MySql
sbret.Append(" RETURNING ");
var colidx = 0;
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in _table.Columns.Values)
{
if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
dic.Add(col.CsName, colidx);
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
++colidx;
}
queryIndexs = AdoProvider.GetQueryTypeProperties(queryType).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray();
queryFlag = sbflag.ToString();
}
var sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null;
try
{
await _orm.Ado.ExecuteReaderAsync(_connection, _transaction, fetch =>
{
ret.Add((T1)Utils.ExecuteReaderToClass(queryFlag, queryType, queryIndexs, fetch.Object, 0, _commonUtils));
return Task.FromResult(false);
}, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken);
ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken));
}
catch (Exception ex)
{
@@ -134,7 +111,11 @@ namespace FreeSql.Odbc.MySql
_orm.Aop.CurdAfterHandler?.Invoke(this, after);
}
});
sbret?.Clear();
if (dbParms != null)
{
this.ClearData();
sbret.Clear();
}
return ret;
}
#endif

31
Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlInsert.cs
View File

@@ -91,20 +91,12 @@ namespace FreeSql.Odbc.MySql
sb.Append(sql).Append(" RETURNING ");
var colidx = 0;
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in _table.Columns.Values)
{
if (colidx > 0) sb.Append(", ");
sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
dic.Add(col.CsName, colidx);
sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
++colidx;
}
var queryType = _table.TypeLazy ?? _table.Type;
var indexes = AdoProvider.GetQueryTypeProperties(queryType).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray();
var flag = sbflag.ToString();
sql = sb.ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
@@ -112,10 +104,7 @@ namespace FreeSql.Odbc.MySql
Exception exception = null;
try
{
_orm.Ado.ExecuteReader(_connection, _transaction, fetch =>
{
ret.Add((T1)Utils.ExecuteReaderToClass(flag, queryType, indexes, fetch.Object, 0, _commonUtils));
}, CommandType.Text, sql, _commandTimeout, _params);
ret = _orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
}
catch (Exception ex)
{
@@ -182,20 +171,12 @@ namespace FreeSql.Odbc.MySql
sb.Append(sql).Append(" RETURNING ");
var colidx = 0;
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in _table.Columns.Values)
{
if (colidx > 0) sb.Append(", ");
sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
dic.Add(col.CsName, colidx);
sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
++colidx;
}
var queryType = _table.TypeLazy ?? _table.Type;
var indexes = AdoProvider.GetQueryTypeProperties(queryType).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray();
var flag = sbflag.ToString();
sql = sb.ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
@@ -203,11 +184,7 @@ namespace FreeSql.Odbc.MySql
Exception exception = null;
try
{
await _orm.Ado.ExecuteReaderAsync(_connection, _transaction, fetch =>
{
ret.Add((T1)Utils.ExecuteReaderToClass(flag, queryType, indexes, fetch.Object, 0, _commonUtils));
return Task.FromResult(false);
}, CommandType.Text, sql, _commandTimeout, _params);
ret = await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, _params, cancellationToken);
}
catch (Exception ex)
{

115
Providers/FreeSql.Provider.Odbc/MySql/Curd/OdbcMySqlUpdate.cs
View File

@@ -31,14 +31,11 @@ namespace FreeSql.Odbc.MySql
public override int ExecuteAffrows() => base.SplitExecuteAffrows(_batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000);
protected override List<TReturn> ExecuteUpdated<TReturn>(IEnumerable<ColumnInfo> columns) => base.SplitExecuteUpdated<TReturn>(_batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000, columns);
protected override List<TReturn> RawExecuteUpdated<TReturn>(IEnumerable<ColumnInfo> columns)
{
var ret = new List<TReturn>();
DbParameter[] dbParms = null;
StringBuilder sbret = null;
var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
int[] queryIndexs = null;
var queryFlag = "";
protected override List<TReturn> RawExecuteUpdated<TReturn>(IEnumerable<ColumnInfo> columns)
{
var ret = new List<TReturn>();
DbParameter[] dbParms = null;
StringBuilder sbret = null;
ToSqlFetch(sb =>
{
if (dbParms == null)
@@ -48,19 +45,12 @@ namespace FreeSql.Odbc.MySql
sbret.Append(" RETURNING ");
var colidx = 0;
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in columns)
{
if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
dic.Add(col.CsName, colidx);
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
++colidx;
}
queryIndexs = AdoProvider.GetQueryTypeProperties(queryType).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray();
queryFlag = sbflag.ToString();
}
var sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
@@ -69,30 +59,27 @@ namespace FreeSql.Odbc.MySql
Exception exception = null;
try
{
var rettmp = new List<TReturn>();
_orm.Ado.ExecuteReader(_connection, _transaction, fetch =>
{
rettmp.Add((TReturn)Utils.ExecuteReaderToClass(queryFlag, queryType, queryIndexs, fetch.Object, 0, _commonUtils));
}, CommandType.Text, sql, _commandTimeout, dbParms);
var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
var rettmp = _orm.Ado.Query<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms);
ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
ret.AddRange(rettmp);
}
catch (Exception ex)
{
exception = ex;
throw;
}
finally
{
var after = new Aop.CurdAfterEventArgs(before, exception, ret);
_orm.Aop.CurdAfterHandler?.Invoke(this, after);
}
});
sbret?.Clear();
return ret;
}
{
exception = ex;
throw;
}
finally
{
var after = new Aop.CurdAfterEventArgs(before, exception, ret);
_orm.Aop.CurdAfterHandler?.Invoke(this, after);
}
});
sbret?.Clear();
return ret;
}
protected override void ToSqlCase(StringBuilder caseWhen, ColumnInfo[] primarys)
protected override void ToSqlCase(StringBuilder caseWhen, ColumnInfo[] primarys)
{
if (primarys.Length == 1)
{
@@ -134,14 +121,11 @@ namespace FreeSql.Odbc.MySql
public override Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default) => base.SplitExecuteAffrowsAsync(_batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000, cancellationToken);
protected override Task<List<TReturn>> ExecuteUpdatedAsync<TReturn>(IEnumerable<ColumnInfo> columns, CancellationToken cancellationToken = default) => base.SplitExecuteUpdatedAsync<TReturn>(_batchRowsLimit > 0 ? _batchRowsLimit : 500, _batchParameterLimit > 0 ? _batchParameterLimit : 3000, columns, cancellationToken);
async protected override Task<List<TReturn>> RawExecuteUpdatedAsync<TReturn>(IEnumerable<ColumnInfo> columns, CancellationToken cancellationToken = default)
{
var ret = new List<TReturn>();
DbParameter[] dbParms = null;
StringBuilder sbret = null;
var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
int[] queryIndexs = null;
var queryFlag = "";
async protected override Task<List<TReturn>> RawExecuteUpdatedAsync<TReturn>(IEnumerable<ColumnInfo> columns, CancellationToken cancellationToken = default)
{
var ret = new List<TReturn>();
DbParameter[] dbParms = null;
StringBuilder sbret = null;
await ToSqlFetchAsync(async sb =>
{
if (dbParms == null)
@@ -151,19 +135,12 @@ namespace FreeSql.Odbc.MySql
sbret.Append(" RETURNING ");
var colidx = 0;
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in columns)
{
if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
dic.Add(col.CsName, colidx);
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
++colidx;
}
queryIndexs = AdoProvider.GetQueryTypeProperties(queryType).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray();
queryFlag = sbflag.ToString();
}
var sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
@@ -172,29 +149,25 @@ namespace FreeSql.Odbc.MySql
Exception exception = null;
try
{
var rettmp = new List<TReturn>();
await _orm.Ado.ExecuteReaderAsync(_connection, _transaction, fetch =>
{
rettmp.Add((TReturn)Utils.ExecuteReaderToClass(queryFlag, queryType, queryIndexs, fetch.Object, 0, _commonUtils));
return Task.FromResult(false);
}, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken);
var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
var rettmp = await _orm.Ado.QueryAsync<TReturn>(queryType, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken);
ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
ret.AddRange(rettmp);
}
catch (Exception ex)
{
exception = ex;
throw;
}
finally
{
var after = new Aop.CurdAfterEventArgs(before, exception, ret);
_orm.Aop.CurdAfterHandler?.Invoke(this, after);
}
});
sbret?.Clear();
return ret;
}
{
exception = ex;
throw;
}
finally
{
var after = new Aop.CurdAfterEventArgs(before, exception, ret);
_orm.Aop.CurdAfterHandler?.Invoke(this, after);
}
});
sbret?.Clear();
return ret;
}
#endif
}
}
}