From 46cfed7e17bef9e4a5b3de16d05685fa9a92ff64 Mon Sep 17 00:00:00 2001
From: sunkaixuna <610262374@qq.com>
Date: Sun, 9 Jan 2022 16:24:43 +0800
Subject: [PATCH] Update db.First by sqlite
---
.../DbFirstProvider/DbFirstProvider.cs | 2 +-
.../DbMaintenance/SqliteDbMaintenance.cs | 2 +-
Src/Asp.Net/SqliteTest/SqliteTest.csproj | 1 +
Src/Asp.Net/SqliteTest/UnitTest/Main.cs | 1 +
Src/Asp.Net/SqliteTest/UnitTest/UCustom02.cs | 32 +++++++++++++++++++
5 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 Src/Asp.Net/SqliteTest/UnitTest/UCustom02.cs
diff --git a/Src/Asp.Net/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs
index 8181c3a98..34057639c 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs
@@ -214,7 +214,7 @@ namespace SqlSugar
internal string GetClassString(DbTableInfo tableInfo, ref string className)
{
string classText;
- var columns = this.Context.DbMaintenance.GetColumnInfosByTableName(tableInfo.Name);
+ var columns = this.Context.DbMaintenance.GetColumnInfosByTableName(tableInfo.Name,false);
if (this.Context.IgnoreColumns.HasValue())
{
var entityName = this.Context.EntityMaintenance.GetEntityName(tableInfo.Name);
diff --git a/Src/Asp.Net/SqlSugar/Realization/Sqlite/DbMaintenance/SqliteDbMaintenance.cs b/Src/Asp.Net/SqlSugar/Realization/Sqlite/DbMaintenance/SqliteDbMaintenance.cs
index 0f68d18d2..701c9baa8 100644
--- a/Src/Asp.Net/SqlSugar/Realization/Sqlite/DbMaintenance/SqliteDbMaintenance.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/Sqlite/DbMaintenance/SqliteDbMaintenance.cs
@@ -317,7 +317,7 @@ namespace SqlSugar
{
DbColumnInfo column = new DbColumnInfo()
{
- TableName = tableName,
+ TableName =this.SqlBuilder.GetNoTranslationColumnName(tableName+""),
DataType = row["DataTypeName"].ToString().Trim(),
IsNullable = (bool)row["AllowDBNull"],
IsIdentity = (bool)row["IsAutoIncrement"],
diff --git a/Src/Asp.Net/SqliteTest/SqliteTest.csproj b/Src/Asp.Net/SqliteTest/SqliteTest.csproj
index ad0044220..d8f59f483 100644
--- a/Src/Asp.Net/SqliteTest/SqliteTest.csproj
+++ b/Src/Asp.Net/SqliteTest/SqliteTest.csproj
@@ -84,6 +84,7 @@
+
diff --git a/Src/Asp.Net/SqliteTest/UnitTest/Main.cs b/Src/Asp.Net/SqliteTest/UnitTest/Main.cs
index 80bfc277b..cf9508ef4 100644
--- a/Src/Asp.Net/SqliteTest/UnitTest/Main.cs
+++ b/Src/Asp.Net/SqliteTest/UnitTest/Main.cs
@@ -32,6 +32,7 @@ namespace OrmTest
public static void Init()
{
UCustom01.Init();
+ UCustom02.Init();
Insert();
CodeFirst();
Updateable();
diff --git a/Src/Asp.Net/SqliteTest/UnitTest/UCustom02.cs b/Src/Asp.Net/SqliteTest/UnitTest/UCustom02.cs
new file mode 100644
index 000000000..487d4772f
--- /dev/null
+++ b/Src/Asp.Net/SqliteTest/UnitTest/UCustom02.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using F9.DataEntity.Entity;
+using SqlSugar;
+namespace OrmTest
+{
+ public class UCustom02
+ {
+ public static void Init()
+ {
+ var db = NewUnitTest.Db;
+ foreach (DbTableInfo table in db.DbMaintenance.GetTableInfoList())
+ {
+ string entityName = table.Name.ToUpper();
+ db.MappingTables.Add(entityName, table.Name);
+ foreach (DbColumnInfo col in db.DbMaintenance.GetColumnInfosByTableName(table.Name))
+ {
+ string propertyName = col.DbColumnName.ToUpper();
+ //Console.WriteLine("propertyName=" + propertyName + ", column=" + col.DbColumnName);
+ db.MappingColumns.Add(propertyName, col.DbColumnName, entityName);
+ }
+ }
+
+ // Console.WriteLine(db.Utilities.SerializeObject(db.MappingColumns));
+
+ Check.Exception(!db.Queryable().ToClassString(null).Contains("Name"), "unit error");
+ }
+ }
+}