From 88989f13f364aafb6fcccd061b86bd2471981055 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Sat, 17 Dec 2022 12:49:02 +0800
Subject: [PATCH] Update mysql
---
Src/Asp.Net/MySqlTest/MySqlTest.csproj | 1 +
Src/Asp.Net/MySqlTest/UnitTest/Main.cs | 1 +
Src/Asp.Net/MySqlTest/UnitTest/UInsert3.cs | 57 +++++++++++++++++++
.../MySql/SqlBuilder/MySqlInsertBuilder.cs | 4 +-
4 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 Src/Asp.Net/MySqlTest/UnitTest/UInsert3.cs
diff --git a/Src/Asp.Net/MySqlTest/MySqlTest.csproj b/Src/Asp.Net/MySqlTest/MySqlTest.csproj
index 6ad0376a7..d32dbee72 100644
--- a/Src/Asp.Net/MySqlTest/MySqlTest.csproj
+++ b/Src/Asp.Net/MySqlTest/MySqlTest.csproj
@@ -133,6 +133,7 @@
+
diff --git a/Src/Asp.Net/MySqlTest/UnitTest/Main.cs b/Src/Asp.Net/MySqlTest/UnitTest/Main.cs
index 0ff9f1c23..9d037c97c 100644
--- a/Src/Asp.Net/MySqlTest/UnitTest/Main.cs
+++ b/Src/Asp.Net/MySqlTest/UnitTest/Main.cs
@@ -31,6 +31,7 @@ namespace OrmTest
}
public static void Init()
{
+ UInsert3.Init();
UnitSubToList.Init();
UCustom20.Init();
UCustom07.Init();
diff --git a/Src/Asp.Net/MySqlTest/UnitTest/UInsert3.cs b/Src/Asp.Net/MySqlTest/UnitTest/UInsert3.cs
new file mode 100644
index 000000000..596529c2e
--- /dev/null
+++ b/Src/Asp.Net/MySqlTest/UnitTest/UInsert3.cs
@@ -0,0 +1,57 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlTypes;
+using System.Linq;
+using System.Security.Principal;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OrmTest
+{
+ internal class UInsert3
+ {
+ public static void Init()
+ {
+ var db = NewUnitTest.Db;
+ db.Insertable(new Order() { Name = "a" }).ExecuteCommand();
+
+ db.Insertable(new List() {
+ new Order() { Name = "a" },
+ new Order() { Name = "a" }
+ }).ExecuteCommand();
+
+ db.Insertable(new ORDER() { Name = "a" }).ExecuteCommand();
+ }
+
+ public class Order
+ {
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public int Id { get; set; }
+ ///
+ /// 姓名
+ ///
+ public string Name { get; set; }
+ public decimal Price { get; set; }
+ [SugarColumn(InsertServerTime =true)]
+ public DateTime CreateTime { get; set; }
+ [SugarColumn(IsNullable = true)]
+ public int CustomId { get; set; }
+ }
+ [SugarTable("Order")]
+ public class ORDER
+ {
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public int Id { get; set; }
+ ///
+ /// 姓名
+ ///
+ public string Name { get; set; }
+ public decimal Price { get; set; }
+ [SugarColumn(InsertSql = "'2020-1-1'")]
+ public DateTime CreateTime { get; set; }
+ [SugarColumn(IsNullable = true)]
+ public int CustomId { get; set; }
+ }
+ }
+}
diff --git a/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlInsertBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlInsertBuilder.cs
index 097af481a..03b587409 100644
--- a/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlInsertBuilder.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/MySql/SqlBuilder/MySqlInsertBuilder.cs
@@ -125,7 +125,7 @@ namespace SqlSugar
string columnsString = string.Join(",", groupList.First().Select(it => Builder.GetTranslationColumnName(it.DbColumnName)));
if (isSingle)
{
- string columnParametersString = string.Join(",", this.DbColumnInfoList.Select(it => Builder.SqlParameterKeyWord + it.DbColumnName));
+ string columnParametersString = string.Join(",", this.DbColumnInfoList.Select(it =>base.GetDbColumn(it, Builder.SqlParameterKeyWord + it.DbColumnName)));
ActionMinDate();
return string.Format(SqlTemplate, GetTableNameString, columnsString, columnParametersString);
}
@@ -140,7 +140,7 @@ namespace SqlSugar
foreach (var item in groupList)
{
batchInsetrSql.Append("(");
- insertColumns = string.Join(",", item.Select(it => FormatValue(it.Value,it.PropertyName)));
+ insertColumns = string.Join(",", item.Select(it =>base.GetDbColumn(it, FormatValue(it.Value,it.PropertyName))));
batchInsetrSql.Append(insertColumns);
if (groupList.Last() == item)
{