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

- 修复 MySql8.0.30 无法使用 ExecuteInserted 的问题；#2001

Browse Source
This commit is contained in:
2881099
2025-03-28 14:00:24 +08:00
parent 53172a46fa
commit bdeb264fe9
11 changed files with 287 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Examples/base_entity/Program.cs
View File

@@ -621,7 +621,16 @@ namespace base_entity
BaseEntity.Initialization(fsql, () => _asyncUow.Value);
#endregion
fsql.Delete<User1>().Where("1=1").ExecuteAffrows();
fsql.Insert(new List<User1>
{
new User1 { Nickname = "nickname11", Username = "username11", Description = "desc11" },
new User1 { Nickname = "n2", Username = "u2", Description = "d2" },
new User1 { Nickname = "n3", Username = "u3", Description = "d3" },
}).ExecuteAffrows();
fsql.Insert(new User1()).ExecuteInserted();
fsql.Update<User1>().SetSource(new User1()).ExecuteUpdated();
fsql.InsertOrUpdate<AppInfoEntity>().SetSource(new AppInfoEntity { AppID = "03DN8CW8", AppName = "app_01" }).ExecuteAffrows();
var repo2211 = fsql.GetRepository<AppInfoEntity>();

8
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@@ -758,5 +758,13 @@
<param name="that"></param>
<returns></returns>
</member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Reflection.Assembly[])">
<summary>
批量注入 Repository，可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members>
</doc>

2
FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
View File

@@ -92,7 +92,7 @@ namespace FreeSql.Internal.CommonProvider
}
}
internal Dictionary<string, PropertyInfo> GetQueryTypeProperties(Type type)
public static Dictionary<string, PropertyInfo> GetQueryTypeProperties(Type type)
{
return type.GetPropertiesDictIgnoreCase(); //与 ExecuteArrayRowReadClassOrTuple 顺序同步，防止【延时属性】获取到位置不对的问题
//var tb = _util.GetTableByEntity(type);

14
FreeSql/Internal/CommonProvider/UpdateProvider.cs
View File

@@ -8,6 +8,7 @@ using System.Data.Common;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace FreeSql.Internal.CommonProvider
@@ -476,13 +477,20 @@ namespace FreeSql.Internal.CommonProvider
public abstract int ExecuteAffrows();
protected abstract List<TReturn> ExecuteUpdated<TReturn>(IEnumerable<ColumnInfo> columns);
public List<T1> ExecuteUpdated() => ExecuteUpdated<T1>(_table.ColumnsByPosition);
public List<T1> ExecuteUpdated()
{
var ret = ExecuteUpdated<T1>(_table.Columns.Values);
if (_table.TypeLazySetOrm != null) ret.ForEach(item => _table.TypeLazySetOrm.Invoke(item, new object[] { _orm }));
return ret;
}
public List<TReturn> ExecuteUpdated<TReturn>(Expression<Func<T1, TReturn>> returnColumns)
{
var cols = _commonExpression.ExpressionSelectColumns_MemberAccess_New_NewArrayInit(null, null, returnColumns?.Body, false, null)
.Distinct().Select(a => _table.ColumnsByCs.TryGetValue(a, out var c) ? c : null).Where(a => a != null).ToArray();
return ExecuteUpdated<TReturn>(cols);
}
var ret = ExecuteUpdated<TReturn>(cols);
if (_table.TypeLazySetOrm != null) ret.ForEach(item => _table.TypeLazySetOrm.Invoke(item, new object[] { _orm }));
return ret;
}
public IUpdate<T1> IgnoreColumns(Expression<Func<T1, object>> columns) => IgnoreColumns(_commonExpression.ExpressionSelectColumns_MemberAccess_New_NewArrayInit(null, null, columns?.Body, false, null));
public IUpdate<T1> UpdateColumns(Expression<Func<T1, object>> columns) => UpdateColumns(_commonExpression.ExpressionSelectColumns_MemberAccess_New_NewArrayInit(null, null, columns?.Body, false, null));

15
FreeSql/Internal/CommonProvider/UpdateProviderAsync.cs
View File

@@ -143,13 +143,20 @@ namespace FreeSql.Internal.CommonProvider
public abstract Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default);
protected abstract Task<List<TReturn>> ExecuteUpdatedAsync<TReturn>(IEnumerable<ColumnInfo> columns, CancellationToken cancellationToken = default);
public Task<List<T1>> ExecuteUpdatedAsync(CancellationToken cancellationToken = default) => ExecuteUpdatedAsync<T1>(_table.ColumnsByPosition, cancellationToken);
public Task<List<TReturn>> ExecuteUpdatedAsync<TReturn>(Expression<Func<T1, TReturn>> returnColumns, CancellationToken cancellationToken = default)
async public Task<List<T1>> ExecuteUpdatedAsync(CancellationToken cancellationToken = default)
{
var ret = await ExecuteUpdatedAsync<T1>(_table.ColumnsByPosition, cancellationToken);
if (_table.TypeLazySetOrm != null) ret.ForEach(item => _table.TypeLazySetOrm.Invoke(item, new object[] { _orm }));
return ret;
}
async public Task<List<TReturn>> ExecuteUpdatedAsync<TReturn>(Expression<Func<T1, TReturn>> returnColumns, CancellationToken cancellationToken = default)
{
var cols = _commonExpression.ExpressionSelectColumns_MemberAccess_New_NewArrayInit(null, null, returnColumns?.Body, false, null)
.Distinct().Select(a => _table.ColumnsByCs.TryGetValue(a, out var c) ? c : null).Where(a => a != null).ToArray();
return ExecuteUpdatedAsync<TReturn>(cols, cancellationToken);
}
var ret = await ExecuteUpdatedAsync<TReturn>(cols, cancellationToken);
if (_table.TypeLazySetOrm != null) ret.ForEach(item => _table.TypeLazySetOrm.Invoke(item, new object[] { _orm }));
return ret;
}
#endif
}
}

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

@@ -1,10 +1,12 @@
using FreeSql.Internal;
using FreeSql.Internal.CommonProvider;
using FreeSql.Internal.Model;
using FreeSql.Internal.ObjectPool;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -89,24 +91,18 @@ namespace FreeSql.Custom.MySql
sb.Append(sql).Append(" RETURNING ");
var colidx = 0;
var propidx = 0;
var props = _table.Type.GetPropertiesDictIgnoreCase();
var indexes = new int[props.Count];
var sbflag = new StringBuilder().Append("insertedQuery");
foreach (var prop in props)
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in _table.Columns.Values)
{
if (_table.ColumnsByCs.TryGetValue(prop.Key, out var col))
{
if (colidx > 0) sb.Append(", ");
sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
indexes[propidx] = colidx;
++colidx;
}
else
indexes[propidx] = -1;
++propidx;
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);
++colidx;
}
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).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);
@@ -185,24 +181,18 @@ namespace FreeSql.Custom.MySql
sb.Append(sql).Append(" RETURNING ");
var colidx = 0;
var propidx = 0;
var props = _table.Type.GetPropertiesDictIgnoreCase();
var indexes = new int[props.Count];
var sbflag = new StringBuilder().Append("insertedQuery");
foreach (var prop in props)
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in _table.Columns.Values)
{
if (_table.ColumnsByCs.TryGetValue(prop.Key, out var col))
{
if (colidx > 0) sb.Append(", ");
sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
indexes[propidx] = colidx;
++colidx;
}
else
indexes[propidx] = -1;
++propidx;
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);
++colidx;
}
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).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);

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

@@ -1,4 +1,5 @@
using FreeSql.Internal;
using FreeSql.Internal.CommonProvider;
using FreeSql.Internal.Model;
using System;
using System.Collections.Generic;
@@ -35,35 +36,48 @@ namespace FreeSql.Custom.MySql
var ret = new List<TReturn>();
DbParameter[] dbParms = null;
StringBuilder sbret = null;
ToSqlFetch(sb =>
{
if (dbParms == null)
{
dbParms = _params.Concat(_paramsSource).ToArray();
sbret = new StringBuilder();
sbret.Append(" RETURNING ");
var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
int[] queryIndexs = null;
var queryFlag = "";
ToSqlFetch(sb =>
{
if (dbParms == null)
{
dbParms = _params.Concat(_paramsSource).ToArray();
sbret = new StringBuilder();
sbret.Append(" RETURNING ");
var colidx = 0;
foreach (var col in columns)
{
if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
++colidx;
}
}
var sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
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) sb.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);
++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);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null;
try
{
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 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);
ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
ret.AddRange(rettmp);
}
catch (Exception ex)
{
exception = ex;
throw;
@@ -125,6 +139,9 @@ namespace FreeSql.Custom.MySql
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 = "";
await ToSqlFetchAsync(async sb =>
{
if (dbParms == null)
@@ -134,12 +151,19 @@ namespace FreeSql.Custom.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))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
if (colidx > 0) sb.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);
++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);
@@ -147,10 +171,14 @@ namespace FreeSql.Custom.MySql
Exception exception = null;
try
{
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);
{
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);
ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
ret.AddRange(rettmp);
}
catch (Exception ex)

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

@@ -1,9 +1,11 @@
using FreeSql.Internal;
using FreeSql.Internal.CommonProvider;
using FreeSql.Internal.Model;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -77,24 +79,18 @@ namespace FreeSql.MySql.Curd
sb.Append(sql).Append(" RETURNING ");
var colidx = 0;
var propidx = 0;
var props = _table.Type.GetPropertiesDictIgnoreCase(); //与 ExecuteArrayRowReadClassOrTuple 顺序同步
var indexes = new int[props.Count];
var sbflag = new StringBuilder().Append("insertedQuery");
foreach (var prop in props)
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in _table.Columns.Values)
{
if (_table.ColumnsByCs.TryGetValue(prop.Key, out var col))
{
if (colidx > 0) sb.Append(", ");
sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
indexes[propidx] = colidx;
++colidx;
}
else
indexes[propidx] = -1;
++propidx;
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);
++colidx;
}
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).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);
@@ -162,24 +158,18 @@ namespace FreeSql.MySql.Curd
sb.Append(sql).Append(" RETURNING ");
var colidx = 0;
var propidx = 0;
var props = _table.Type.GetPropertiesDictIgnoreCase();
var indexes = new int[props.Count];
var sbflag = new StringBuilder().Append("insertedQuery");
foreach (var prop in props)
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in _table.Columns.Values)
{
if (_table.ColumnsByCs.TryGetValue(prop.Key, out var col))
{
if (colidx > 0) sb.Append(", ");
sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
indexes[propidx] = colidx;
++colidx;
}
else
indexes[propidx] = -1;
++propidx;
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);
++colidx;
}
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).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);

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

@@ -1,4 +1,5 @@
using FreeSql.Internal;
using FreeSql.Internal.CommonProvider;
using FreeSql.Internal.Model;
using System;
using System.Collections.Generic;
@@ -35,6 +36,9 @@ namespace FreeSql.MySql.Curd
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 = "";
ToSqlFetch(sb =>
{
if (dbParms == null)
@@ -44,12 +48,19 @@ namespace FreeSql.MySql.Curd
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))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
if (colidx > 0) sb.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);
++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);
@@ -58,8 +69,11 @@ namespace FreeSql.MySql.Curd
Exception exception = null;
try
{
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);
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);
ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
ret.AddRange(rettmp);
}
@@ -125,6 +139,9 @@ namespace FreeSql.MySql.Curd
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 = "";
await ToSqlFetchAsync(async sb =>
{
if (dbParms == null)
@@ -134,12 +151,19 @@ namespace FreeSql.MySql.Curd
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))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
if (colidx > 0) sb.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);
++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);
@@ -147,10 +171,14 @@ namespace FreeSql.MySql.Curd
Exception exception = null;
try
{
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);
{
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);
ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
ret.AddRange(rettmp);
}
catch (Exception ex)

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

@@ -1,10 +1,12 @@
using FreeSql.Internal;
using FreeSql.Internal.CommonProvider;
using FreeSql.Internal.Model;
using FreeSql.Internal.ObjectPool;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -89,24 +91,18 @@ namespace FreeSql.Odbc.MySql
sb.Append(sql).Append(" RETURNING ");
var colidx = 0;
var propidx = 0;
var props = _table.Type.GetPropertiesDictIgnoreCase();
var indexes = new int[props.Count];
var sbflag = new StringBuilder().Append("insertedQuery");
foreach (var prop in props)
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in _table.Columns.Values)
{
if (_table.ColumnsByCs.TryGetValue(prop.Key, out var col))
{
if (colidx > 0) sb.Append(", ");
sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
indexes[propidx] = colidx;
++colidx;
}
else
indexes[propidx] = -1;
++propidx;
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);
++colidx;
}
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).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);
@@ -185,24 +181,18 @@ namespace FreeSql.Odbc.MySql
sb.Append(sql).Append(" RETURNING ");
var colidx = 0;
var propidx = 0;
var props = _table.Type.GetPropertiesDictIgnoreCase();
var indexes = new int[props.Count];
var sbflag = new StringBuilder().Append("insertedQuery");
foreach (var prop in props)
var sbflag = new StringBuilder().Append("adoQuery(crud)");
var dic = new Dictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);
foreach (var col in _table.Columns.Values)
{
if (_table.ColumnsByCs.TryGetValue(prop.Key, out var col))
{
if (colidx > 0) sb.Append(", ");
sb.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name)));
sbflag.Append(col.Attribute.Name).Append(":").Append(colidx).Append(",");
indexes[propidx] = colidx;
++colidx;
}
else
indexes[propidx] = -1;
++propidx;
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);
++colidx;
}
var indexes = AdoProvider.GetQueryTypeProperties(_table.TypeLazy ?? _table.Type).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);

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

@@ -1,4 +1,5 @@
using FreeSql.Internal;
using FreeSql.Internal.CommonProvider;
using FreeSql.Internal.Model;
using System;
using System.Collections.Generic;
@@ -35,35 +36,48 @@ namespace FreeSql.Odbc.MySql
var ret = new List<TReturn>();
DbParameter[] dbParms = null;
StringBuilder sbret = null;
ToSqlFetch(sb =>
{
if (dbParms == null)
{
dbParms = _params.Concat(_paramsSource).ToArray();
sbret = new StringBuilder();
sbret.Append(" RETURNING ");
var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
int[] queryIndexs = null;
var queryFlag = "";
ToSqlFetch(sb =>
{
if (dbParms == null)
{
dbParms = _params.Concat(_paramsSource).ToArray();
sbret = new StringBuilder();
sbret.Append(" RETURNING ");
var colidx = 0;
foreach (var col in columns)
{
if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
++colidx;
}
}
var sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
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) sb.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);
++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);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null;
try
{
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 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);
ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
ret.AddRange(rettmp);
}
catch (Exception ex)
{
exception = ex;
throw;
@@ -125,35 +139,49 @@ namespace FreeSql.Odbc.MySql
var ret = new List<TReturn>();
DbParameter[] dbParms = null;
StringBuilder sbret = null;
await ToSqlFetchAsync(async sb =>
{
if (dbParms == null)
{
dbParms = _params.Concat(_paramsSource).ToArray();
sbret = new StringBuilder();
sbret.Append(" RETURNING ");
var queryType = typeof(TReturn) == typeof(T1) ? (_table.TypeLazy ?? _table.Type) : null;
int[] queryIndexs = null;
var queryFlag = "";
await ToSqlFetchAsync(async sb =>
{
if (dbParms == null)
{
dbParms = _params.Concat(_paramsSource).ToArray();
sbret = new StringBuilder();
sbret.Append(" RETURNING ");
var colidx = 0;
foreach (var col in columns)
{
if (colidx > 0) sbret.Append(", ");
sbret.Append(_commonUtils.RereadColumn(col, _commonUtils.QuoteSqlName(col.Attribute.Name))).Append(" as ").Append(_commonUtils.QuoteSqlName(col.CsName));
++colidx;
}
}
var sql = sb.Append(sbret).ToString();
var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Update, sql, dbParms);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
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) sb.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);
++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);
_orm.Aop.CurdBeforeHandler?.Invoke(this, before);
Exception exception = null;
try
{
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 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);
ValidateVersionAndThrow(rettmp.Count, sql, dbParms);
ret.AddRange(rettmp);
}
catch (Exception ex)
{
exception = ex;
throw;