weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-06 08:20:52 +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-28 18:32:04 +08:00
parent bdeb264fe9
commit 1fcda96b5b
9 changed files with 135 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlDelete.cs
View File

@@ -1,8 +1,10 @@
using FreeSql.Internal; using FreeSql.Internal;
using FreeSql.Internal.CommonProvider;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.Common; using System.Data.Common;
using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -22,6 +24,9 @@ namespace FreeSql.Custom.MySql
var ret = new List<T1>(); var ret = new List<T1>();
DbParameter[] dbParms = null; DbParameter[] dbParms = null;
StringBuilder sbret = null; StringBuilder sbret = null;
var queryType = _table.TypeLazy ?? _table.Type;
int[] queryIndexs = null;
var queryFlag = "";
ToSqlFetch(sb => ToSqlFetch(sb =>
{ {
if (dbParms == null) if (dbParms == null)
@@ -31,21 +36,31 @@ namespace FreeSql.Custom.MySql
sbret.Append(" RETURNING "); sbret.Append(" RETURNING ");
var colidx = 0; 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) foreach (var col in _table.Columns.Values)
{ {
if (colidx > 0) sbret.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName)); 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);
++colidx; ++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 sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before); _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null; Exception exception = null;
try try
{ {
ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms)); _orm.Ado.ExecuteReader(_connection, _transaction, fetch =>
{
ret.Add((T1)Utils.ExecuteReaderToClass(queryFlag, queryType, queryIndexs, fetch.Object, 0, _commonUtils));
}, CommandType.Text, sql, _commandTimeout, dbParms);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -73,6 +88,9 @@ namespace FreeSql.Custom.MySql
var ret = new List<T1>(); var ret = new List<T1>();
DbParameter[] dbParms = null; DbParameter[] dbParms = null;
StringBuilder sbret = null; StringBuilder sbret = null;
var queryType = _table.TypeLazy ?? _table.Type;
int[] queryIndexs = null;
var queryFlag = "";
await ToSqlFetchAsync(async sb => await ToSqlFetchAsync(async sb =>
{ {
if (dbParms == null) if (dbParms == null)
@@ -82,21 +100,32 @@ namespace FreeSql.Custom.MySql
sbret.Append(" RETURNING "); sbret.Append(" RETURNING ");
var colidx = 0; 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) foreach (var col in _table.Columns.Values)
{ {
if (colidx > 0) sbret.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName)); 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);
++colidx; ++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 sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before); _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null; Exception exception = null;
try try
{ {
ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken)); 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);
} }
catch (Exception ex) catch (Exception ex)
{ {

10
Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlInsert.cs
View File

@@ -102,7 +102,8 @@ namespace FreeSql.Custom.MySql
dic.Add(col.CsName, colidx); dic.Add(col.CsName, colidx);
++colidx; ++colidx;
} }
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray(); 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(); var flag = sbflag.ToString();
sql = sb.ToString(); sql = sb.ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
@@ -113,7 +114,7 @@ namespace FreeSql.Custom.MySql
{ {
_orm.Ado.ExecuteReader(_connection, _transaction, fetch => _orm.Ado.ExecuteReader(_connection, _transaction, fetch =>
{ {
ret.Add((T1)Utils.ExecuteReaderToClass(flag, _table.TypeLazy ?? _table.Type, indexes, fetch.Object, 0, _commonUtils)); ret.Add((T1)Utils.ExecuteReaderToClass(flag, queryType, indexes, fetch.Object, 0, _commonUtils));
}, CommandType.Text, sql, _commandTimeout, _params); }, CommandType.Text, sql, _commandTimeout, _params);
} }
catch (Exception ex) catch (Exception ex)
@@ -192,7 +193,8 @@ namespace FreeSql.Custom.MySql
dic.Add(col.CsName, colidx); dic.Add(col.CsName, colidx);
++colidx; ++colidx;
} }
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray(); 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(); var flag = sbflag.ToString();
sql = sb.ToString(); sql = sb.ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
@@ -203,7 +205,7 @@ namespace FreeSql.Custom.MySql
{ {
await _orm.Ado.ExecuteReaderAsync(_connection, _transaction, fetch => await _orm.Ado.ExecuteReaderAsync(_connection, _transaction, fetch =>
{ {
ret.Add((T1)Utils.ExecuteReaderToClass(flag, _table.TypeLazy ?? _table.Type, indexes, fetch.Object, 0, _commonUtils)); ret.Add((T1)Utils.ExecuteReaderToClass(flag, queryType, indexes, fetch.Object, 0, _commonUtils));
return Task.FromResult(false); return Task.FromResult(false);
}, CommandType.Text, sql, _commandTimeout, _params); }, CommandType.Text, sql, _commandTimeout, _params);
} }

4
Providers/FreeSql.Provider.Custom/MySql/Curd/CustomMySqlUpdate.cs
View File

@@ -52,7 +52,7 @@ namespace FreeSql.Custom.MySql
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase); var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in columns) foreach (var col in columns)
{ {
if (colidx > 0) sb.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))); sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue; if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(","); sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
@@ -155,7 +155,7 @@ namespace FreeSql.Custom.MySql
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase); var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in columns) foreach (var col in columns)
{ {
if (colidx > 0) sb.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))); sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue; if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(","); sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");

53
Providers/FreeSql.Provider.MySql/Curd/MySqlDelete.cs
View File

@@ -1,8 +1,10 @@
using FreeSql.Internal; using FreeSql.Internal;
using FreeSql.Internal.CommonProvider;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.Common; using System.Data.Common;
using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -22,6 +24,9 @@ namespace FreeSql.MySql.Curd
var ret = new List<T1>(); var ret = new List<T1>();
DbParameter[] dbParms = null; DbParameter[] dbParms = null;
StringBuilder sbret = null; StringBuilder sbret = null;
var queryType = _table.TypeLazy ?? _table.Type;
int[] queryIndexs = null;
var queryFlag = "";
ToSqlFetch(sb => ToSqlFetch(sb =>
{ {
if (dbParms == null) if (dbParms == null)
@@ -31,21 +36,31 @@ namespace FreeSql.MySql.Curd
sbret.Append(" RETURNING "); sbret.Append(" RETURNING ");
var colidx = 0; 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) foreach (var col in _table.Columns.Values)
{ {
if (colidx > 0) sbret.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName)); 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);
++colidx; ++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 sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before); _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null; Exception exception = null;
try try
{ {
ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms)); _orm.Ado.ExecuteReader(_connection, _transaction, fetch =>
{
ret.Add((T1)Utils.ExecuteReaderToClass(queryFlag, queryType, queryIndexs, fetch.Object, 0, _commonUtils));
}, CommandType.Text, sql, _commandTimeout, dbParms);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -58,11 +73,7 @@ namespace FreeSql.MySql.Curd
_orm.Aop.CurdAfterHandler?.Invoke(this, after); _orm.Aop.CurdAfterHandler?.Invoke(this, after);
} }
}); });
if (dbParms != null) sbret?.Clear();
{
this.ClearData();
sbret.Clear();
}
return ret; return ret;
} }
@@ -73,6 +84,9 @@ namespace FreeSql.MySql.Curd
var ret = new List<T1>(); var ret = new List<T1>();
DbParameter[] dbParms = null; DbParameter[] dbParms = null;
StringBuilder sbret = null; StringBuilder sbret = null;
var queryType = _table.TypeLazy ?? _table.Type;
int[] queryIndexs = null;
var queryFlag = "";
await ToSqlFetchAsync(async sb => await ToSqlFetchAsync(async sb =>
{ {
if (dbParms == null) if (dbParms == null)
@@ -82,21 +96,32 @@ namespace FreeSql.MySql.Curd
sbret.Append(" RETURNING "); sbret.Append(" RETURNING ");
var colidx = 0; 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) foreach (var col in _table.Columns.Values)
{ {
if (colidx > 0) sbret.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName)); 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);
++colidx; ++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 sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before); _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null; Exception exception = null;
try try
{ {
ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken)); 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);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -109,11 +134,7 @@ namespace FreeSql.MySql.Curd
_orm.Aop.CurdAfterHandler?.Invoke(this, after); _orm.Aop.CurdAfterHandler?.Invoke(this, after);
} }
}); });
if (dbParms != null) sbret?.Clear();
{
this.ClearData();
sbret.Clear();
}
return ret; return ret;
} }
#endif #endif

10
Providers/FreeSql.Provider.MySql/Curd/MySqlInsert.cs
View File

@@ -90,7 +90,8 @@ namespace FreeSql.MySql.Curd
dic.Add(col.CsName, colidx); dic.Add(col.CsName, colidx);
++colidx; ++colidx;
} }
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray(); 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(); var flag = sbflag.ToString();
sql = sb.ToString(); sql = sb.ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
@@ -101,7 +102,7 @@ namespace FreeSql.MySql.Curd
{ {
_orm.Ado.ExecuteReader(_connection, _transaction, fetch => _orm.Ado.ExecuteReader(_connection, _transaction, fetch =>
{ {
ret.Add((T1)Utils.ExecuteReaderToClass(flag, _table.TypeLazy ?? _table.Type, indexes, fetch.Object, 0, _commonUtils)); ret.Add((T1)Utils.ExecuteReaderToClass(flag, queryType, indexes, fetch.Object, 0, _commonUtils));
}, CommandType.Text, sql, _commandTimeout, _params); }, CommandType.Text, sql, _commandTimeout, _params);
} }
catch (Exception ex) catch (Exception ex)
@@ -169,7 +170,8 @@ namespace FreeSql.MySql.Curd
dic.Add(col.CsName, colidx); dic.Add(col.CsName, colidx);
++colidx; ++colidx;
} }
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray(); 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(); var flag = sbflag.ToString();
sql = sb.ToString(); sql = sb.ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
@@ -180,7 +182,7 @@ namespace FreeSql.MySql.Curd
{ {
await _orm.Ado.ExecuteReaderAsync(_connection, _transaction, fetch => await _orm.Ado.ExecuteReaderAsync(_connection, _transaction, fetch =>
{ {
ret.Add((T1)Utils.ExecuteReaderToClass(flag, _table.TypeLazy ?? _table.Type, indexes, fetch.Object, 0, _commonUtils)); ret.Add((T1)Utils.ExecuteReaderToClass(flag, queryType, indexes, fetch.Object, 0, _commonUtils));
return Task.FromResult(false); return Task.FromResult(false);
}, CommandType.Text, sql, _commandTimeout, _params); }, CommandType.Text, sql, _commandTimeout, _params);
} }

4
Providers/FreeSql.Provider.MySql/Curd/MySqlUpdate.cs
View File

@@ -52,7 +52,7 @@ namespace FreeSql.MySql.Curd
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase); var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in columns) foreach (var col in columns)
{ {
if (colidx > 0) sb.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))); sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue; if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(","); sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
@@ -155,7 +155,7 @@ namespace FreeSql.MySql.Curd
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase); var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in columns) foreach (var col in columns)
{ {
if (colidx > 0) sb.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))); sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue; if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(","); sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");

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

@@ -1,8 +1,10 @@
using FreeSql.Internal; using FreeSql.Internal;
using FreeSql.Internal.CommonProvider;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.Common; using System.Data.Common;
using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -22,6 +24,9 @@ namespace FreeSql.Odbc.MySql
var ret = new List<T1>(); var ret = new List<T1>();
DbParameter[] dbParms = null; DbParameter[] dbParms = null;
StringBuilder sbret = null; StringBuilder sbret = null;
var queryType = _table.TypeLazy ?? _table.Type;
int[] queryIndexs = null;
var queryFlag = "";
ToSqlFetch(sb => ToSqlFetch(sb =>
{ {
if (dbParms == null) if (dbParms == null)
@@ -31,26 +36,36 @@ namespace FreeSql.Odbc.MySql
sbret.Append(" RETURNING "); sbret.Append(" RETURNING ");
var colidx = 0; 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) foreach (var col in _table.Columns.Values)
{ {
if (colidx > 0) sbret.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName)); 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);
++colidx; ++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 sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before); _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null; Exception exception = null;
try try
{ {
ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms)); _orm.Ado.ExecuteReader(_connection, _transaction, fetch =>
{
ret.Add((T1)Utils.ExecuteReaderToClass(queryFlag, queryType, queryIndexs, fetch.Object, 0, _commonUtils));
}, CommandType.Text, sql, _commandTimeout, dbParms);
} }
catch (Exception ex) catch (Exception ex)
{ {
exception = ex; exception = ex;
throw ex; throw;
} }
finally finally
{ {
@@ -58,11 +73,7 @@ namespace FreeSql.Odbc.MySql
_orm.Aop.CurdAfterHandler?.Invoke(this, after); _orm.Aop.CurdAfterHandler?.Invoke(this, after);
} }
}); });
if (dbParms != null) sbret?.Clear();
{
this.ClearData();
sbret.Clear();
}
return ret; return ret;
} }
@@ -73,6 +84,9 @@ namespace FreeSql.Odbc.MySql
var ret = new List<T1>(); var ret = new List<T1>();
DbParameter[] dbParms = null; DbParameter[] dbParms = null;
StringBuilder sbret = null; StringBuilder sbret = null;
var queryType = _table.TypeLazy ?? _table.Type;
int[] queryIndexs = null;
var queryFlag = "";
await ToSqlFetchAsync(async sb => await ToSqlFetchAsync(async sb =>
{ {
if (dbParms == null) if (dbParms == null)
@@ -82,26 +96,37 @@ namespace FreeSql.Odbc.MySql
sbret.Append(" RETURNING "); sbret.Append(" RETURNING ");
var colidx = 0; 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) foreach (var col in _table.Columns.Values)
{ {
if (colidx > 0) sbret.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName)); 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);
++colidx; ++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 sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before); _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null; Exception exception = null;
try try
{ {
ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken)); 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);
} }
catch (Exception ex) catch (Exception ex)
{ {
exception = ex; exception = ex;
throw ex; throw;
} }
finally finally
{ {
@@ -109,11 +134,7 @@ namespace FreeSql.Odbc.MySql
_orm.Aop.CurdAfterHandler?.Invoke(this, after); _orm.Aop.CurdAfterHandler?.Invoke(this, after);
} }
}); });
if (dbParms != null) sbret?.Clear();
{
this.ClearData();
sbret.Clear();
}
return ret; return ret;
} }
#endif #endif

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

@@ -102,7 +102,8 @@ namespace FreeSql.Odbc.MySql
dic.Add(col.CsName, colidx); dic.Add(col.CsName, colidx);
++colidx; ++colidx;
} }
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray(); 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(); var flag = sbflag.ToString();
sql = sb.ToString(); sql = sb.ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
@@ -113,7 +114,7 @@ namespace FreeSql.Odbc.MySql
{ {
_orm.Ado.ExecuteReader(_connection, _transaction, fetch => _orm.Ado.ExecuteReader(_connection, _transaction, fetch =>
{ {
ret.Add((T1)Utils.ExecuteReaderToClass(flag, _table.TypeLazy ?? _table.Type, indexes, fetch.Object, 0, _commonUtils)); ret.Add((T1)Utils.ExecuteReaderToClass(flag, queryType, indexes, fetch.Object, 0, _commonUtils));
}, CommandType.Text, sql, _commandTimeout, _params); }, CommandType.Text, sql, _commandTimeout, _params);
} }
catch (Exception ex) catch (Exception ex)
@@ -192,7 +193,8 @@ namespace FreeSql.Odbc.MySql
dic.Add(col.CsName, colidx); dic.Add(col.CsName, colidx);
++colidx; ++colidx;
} }
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).Select(a => dic.TryGetValue(a.Key, out var tryint) ? tryint : -1).ToArray(); 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(); var flag = sbflag.ToString();
sql = sb.ToString(); sql = sb.ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params); var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Insert, sql, _params);
@@ -203,7 +205,7 @@ namespace FreeSql.Odbc.MySql
{ {
await _orm.Ado.ExecuteReaderAsync(_connection, _transaction, fetch => await _orm.Ado.ExecuteReaderAsync(_connection, _transaction, fetch =>
{ {
ret.Add((T1)Utils.ExecuteReaderToClass(flag, _table.TypeLazy ?? _table.Type, indexes, fetch.Object, 0, _commonUtils)); ret.Add((T1)Utils.ExecuteReaderToClass(flag, queryType, indexes, fetch.Object, 0, _commonUtils));
return Task.FromResult(false); return Task.FromResult(false);
}, CommandType.Text, sql, _commandTimeout, _params); }, CommandType.Text, sql, _commandTimeout, _params);
} }

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

@@ -52,7 +52,7 @@ namespace FreeSql.Odbc.MySql
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase); var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in columns) foreach (var col in columns)
{ {
if (colidx > 0) sb.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))); sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue; if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(","); sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
@@ -155,7 +155,7 @@ namespace FreeSql.Odbc.MySql
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase); var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in columns) foreach (var col in columns)
{ {
if (colidx > 0) sb.Append(", "); if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))); sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
if (dic.ContainsKey(col.CsName)) continue; if (dic.ContainsKey(col.CsName)) continue;
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(","); sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");