lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-07-31 15:56:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update core

Browse Source
This commit is contained in:
sunkaixuna 2022-01-16 18:05:33 +08:00
parent a5721a22c6
commit ae41978150
6 changed files with 175 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/FastestProvider/FastestProvider.cs
View File

@ -133,7 +133,10 @@ namespace SqlSugar
await buider.ExecuteBulkCopyAsync(dt);
//var queryTemp = this.context.Queryable<T>().AS(dt.TableName).ToList();//test
var result = await buider.UpdateByTempAsync(GetTableName(), dt.TableName, updateColumns, whereColumns);
this.context.DbMaintenance.DropTable(dt.TableName);
if (this.context.CurrentConnectionConfig.DbType != DbType.Sqlite)
{
this.context.DbMaintenance.DropTable(dt.TableName);
}
this.context.CurrentConnectionConfig.IsAutoCloseConnection = isAuto;
buider.CloseDb();
End(datas, false);

2
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/FastestProvider/Private.cs
View File

@ -18,7 +18,7 @@ namespace SqlSugar
case DbType.SqlServer:
return new SqlServerFastBuilder();
case DbType.Sqlite:
break;
return new SqliteFastBuilder(this.entityInfo);
case DbType.Oracle:
return new OracleFastBuilder(this.entityInfo);
case DbType.PostgreSQL:

27
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/Reportable/ReportableProvider.cs
View File

@ -206,19 +206,28 @@ namespace SqlSugar
else if (type.IsIn(typeof(decimal), typeof(double)))
{
Expression<Func<SingleColumnEntity<object>, object>> exp = it => Convert.ToDecimal(it.ColumnName);
var result = queryBuilder.GetExpressionValue(exp, ResolveExpressType.WhereSingle).GetResultString();
result = Regex.Replace(result, @"\[ColumnName\]", formatBuilder.FormatValue(value) + "", RegexOptions.IgnoreCase);
result = Regex.Replace(result, @"\`ColumnName\`", formatBuilder.FormatValue(value) + "", RegexOptions.IgnoreCase);
result = Regex.Replace(result, @"""ColumnName""", formatBuilder.FormatValue(value) + "", RegexOptions.IgnoreCase);
var result = queryBuilder.LambdaExpressions.DbMehtods.ToDecimal(new MethodCallExpressionModel() {
Args=new List<MethodCallExpressionArgs>() {
new MethodCallExpressionArgs(){
IsMember=true,
MemberName= formatBuilder.FormatValue(value)
}
}
});
return result;
}
else if (type.IsIn(typeof(DateTime)))
{
Expression<Func<SingleColumnEntity<object>, object>> exp= it => Convert.ToDateTime(it.ColumnName);
var result= queryBuilder.GetExpressionValue(exp,ResolveExpressType.WhereSingle).GetResultString();
result = Regex.Replace(result, @"\[ColumnName\]", formatBuilder.FormatValue(value)+"",RegexOptions.IgnoreCase);
result = Regex.Replace(result, @"\`ColumnName\`", formatBuilder.FormatValue(value) + "", RegexOptions.IgnoreCase);
result = Regex.Replace(result, @"""ColumnName""", formatBuilder.FormatValue(value) + "", RegexOptions.IgnoreCase);
Expression<Func<SingleColumnEntity<object>, object>> exp = it => Convert.ToDecimal(it.ColumnName);
var result = queryBuilder.LambdaExpressions.DbMehtods.ToDate(new MethodCallExpressionModel()
{
Args = new List<MethodCallExpressionArgs>() {
new MethodCallExpressionArgs(){
IsMember=true,
MemberName= formatBuilder.FormatValue(value)
}
}
});
return result;
}
else

11
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SqlBuilderProvider/InsertBuilder.cs
View File

@ -174,6 +174,11 @@ namespace SqlSugar
}
public virtual object FormatValue(object value)
{
var N = "N";
if (this.Context.CurrentConnectionConfig.DbType == DbType.Sqlite)
{
N = "";
}
if (value == null)
{
return "NULL";
@ -212,7 +217,7 @@ namespace SqlSugar
}
else if (type == UtilConstants.StringType || type == UtilConstants.ObjType)
{
return "N'" + value.ToString().ToSqlFilter() + "'";
return N+"'" + value.ToString().ToSqlFilter() + "'";
}
else if (type == UtilConstants.DateTimeOffsetType)
{
@ -221,11 +226,11 @@ namespace SqlSugar
}
else if (type == UtilConstants.FloatType)
{
return "N'" +Convert.ToDouble(value).ToString() + "'";
return N+"'" +Convert.ToDouble(value).ToString() + "'";
}
else
{
return "N'" + value.ToString() + "'";
return N+"'" + value.ToString() + "'";
}
}
}

4
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs
View File

@ -840,6 +840,10 @@ namespace SqlSugar
if (this.UpdateParameterIsNull)
{
var whereSql = Regex.Replace(sql, ".* WHERE ", "", RegexOptions.Singleline);
if (sql.Contains("WHERE (EXISTS"))
{
whereSql=Regex.Match(sql, @"\(EXISTS.+").Value;
}
dt = this.Context.Queryable<T>().Where(whereSql).AddParameters(parameters).ToDataTable();
}
else

140
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Realization/Sqlite/SqlBuilder/SqliteFastBuilder.cs Normal file
View File

@ -0,0 +1,140 @@
using System;
using System.Collections.Generic;
using System.Data;
using Microsoft.Data.Sqlite;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SqlSugar
{
public class SqliteFastBuilder : IFastBuilder
{
private EntityInfo entityInfo;
private bool IsUpdate = false;
private DataTable UpdateDataTable { get; set; }
public SqliteFastBuilder(EntityInfo entityInfo)
{
this.entityInfo = entityInfo;
}
public SqlSugarProvider Context { get; set; }
public void CloseDb()
{
if (this.Context.CurrentConnectionConfig.IsAutoCloseConnection)
{
this.Context.Close();
}
}
public async Task CreateTempAsync<T>(DataTable dt) where T : class, new()
{
await Task.Delay(0);
IsUpdate = true;
}
public async Task<int> ExecuteBulkCopyAsync(DataTable dt)
{
if (dt.Rows.Count == 0||IsUpdate)
{
this.UpdateDataTable = dt;
return 0;
}
foreach (var item in this.entityInfo.Columns)
{
if (item.IsIdentity && dt.Columns.Contains(item.DbColumnName))
{
dt.Columns.Remove(item.DbColumnName);
}
}
var dictionary = this.Context.Utilities.DataTableToDictionaryList(dt.Rows.Cast<DataRow>().Take(1).CopyToDataTable());
int result = 0;
var cn = this.Context.Ado.Connection as SqliteConnection;
Open(cn);
if (this.Context.Ado.Transaction == null)
{
using (var transaction = cn.BeginTransaction())
{
result = await _BulkCopy(dt, dictionary, result, cn);
transaction.Commit();
}
}
else
{
result = await _BulkCopy(dt, dictionary, result, cn);
}
return result;
}
private async Task<int> _BulkCopy(DataTable dt, List<Dictionary<string, object>> dictionary, int i, SqliteConnection cn)
{
using (var cmd = cn.CreateCommand())
{
cmd.CommandText = this.Context.Insertable(dictionary.First()).AS(dt.TableName).ToSql().Key.Replace(";SELECT LAST_INSERT_ROWID();","");
foreach (DataRow dataRow in dt.Rows)
{
foreach (DataColumn item in dt.Columns)
{
cmd.Parameters.AddWithValue("@" + item.ColumnName, dataRow[item.ColumnName]);
}
i += await cmd.ExecuteNonQueryAsync();
}
}
return i;
}
private async Task<int> _BulkUpdate(DataTable dt, List<Dictionary<string, object>> dictionary, int i,string [] whereColums,string [] updateColums, SqliteConnection cn)
{
using (var cmd = cn.CreateCommand())
{
cmd.CommandText = this.Context.Updateable(dictionary.First())
.WhereColumns(whereColums)
.UpdateColumns(updateColums)
.AS(dt.TableName).ToSql().Key;
foreach (DataRow dataRow in dt.Rows)
{
foreach (DataColumn item in dt.Columns)
{
cmd.Parameters.AddWithValue("@" + item.ColumnName, dataRow[item.ColumnName]);
}
i += await cmd.ExecuteNonQueryAsync();
}
}
return i;
}
private static void Open(SqliteConnection cn)
{
if (cn.State != ConnectionState.Open)
cn.Open();
}
public async Task<int> UpdateByTempAsync(string tableName, string tempName, string[] updateColumns, string[] whereColumns)
{
var dt = UpdateDataTable;
if (dt.Rows.Count == 0)
{
return 0;
}
var dictionary = this.Context.Utilities.DataTableToDictionaryList(dt.Rows.Cast<DataRow>().Take(1).CopyToDataTable());
int result = 0;
var cn = this.Context.Ado.Connection as SqliteConnection;
Open(cn);
if (this.Context.Ado.Transaction == null)
{
using (var transaction = cn.BeginTransaction())
{
result = await _BulkUpdate(dt, dictionary, result,whereColumns,updateColumns, cn);
transaction.Commit();
}
}
else
{
result = await _BulkUpdate(dt, dictionary, result, whereColumns, updateColumns, cn);
}
return result;
}
}
}