From c3b3d4e71f1872ec62b7a6e7693487efb44fb1f0 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Sun, 30 Apr 2017 17:26:45 +0800
Subject: [PATCH] -

---
 OrmTest/OrmTest.csproj                        |  6 ++---
 OrmTest/Program.cs                            | 14 +++++-----
 OrmTest/UnitTest/RenameMapping/MapColumn.cs   | 18 +++++++++++++
 OrmTest/UnitTest/RenameMapping/MapTable.cs    | 26 +++++++++++++++++++
 .../DMLBuilder/DeleteBuilder.cs               |  0
 .../DMLBuilder/InsertBuilder.cs               |  0
 .../DMLBuilder/QueryBuilder.cs                |  0
 .../DMLBuilder/SqlQueryBuilder.cs             |  0
 .../DMLBuilder/UpdateBuilder.cs               |  0
 .../SqlBuilderProvider/SqlBuilderAccessory.cs |  0
 .../SqlBuilderProvider/SqlBuilderProvider.cs  |  0
 SqlSugar/SqlSugar.csproj                      | 14 +++++-----
 12 files changed, 61 insertions(+), 17 deletions(-)
 create mode 100644 OrmTest/UnitTest/RenameMapping/MapColumn.cs
 create mode 100644 OrmTest/UnitTest/RenameMapping/MapTable.cs
 rename SqlSugar/Abstract/{ => DbProvider}/SqlBuilderProvider/DMLBuilder/DeleteBuilder.cs (100%)
 rename SqlSugar/Abstract/{ => DbProvider}/SqlBuilderProvider/DMLBuilder/InsertBuilder.cs (100%)
 rename SqlSugar/Abstract/{ => DbProvider}/SqlBuilderProvider/DMLBuilder/QueryBuilder.cs (100%)
 rename SqlSugar/Abstract/{ => DbProvider}/SqlBuilderProvider/DMLBuilder/SqlQueryBuilder.cs (100%)
 rename SqlSugar/Abstract/{ => DbProvider}/SqlBuilderProvider/DMLBuilder/UpdateBuilder.cs (100%)
 rename SqlSugar/Abstract/{ => DbProvider}/SqlBuilderProvider/SqlBuilderAccessory.cs (100%)
 rename SqlSugar/Abstract/{ => DbProvider}/SqlBuilderProvider/SqlBuilderProvider.cs (100%)

diff --git a/OrmTest/OrmTest.csproj b/OrmTest/OrmTest.csproj
index d52153f92..63a5d7f24 100644
--- a/OrmTest/OrmTest.csproj
+++ b/OrmTest/OrmTest.csproj
@@ -72,6 +72,8 @@
     <Compile Include="Models\Student.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UnitTest\RenameMapping\MapColumn.cs" />
+    <Compile Include="UnitTest\RenameMapping\MapTable.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -82,9 +84,7 @@
       <Name>SqlSugar</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="UnitTest\RenameMapping\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OrmTest/Program.cs b/OrmTest/Program.cs
index 34d94e6b1..d62c18926 100644
--- a/OrmTest/Program.cs
+++ b/OrmTest/Program.cs
@@ -19,13 +19,13 @@ namespace OrmTest
         {
             //Unit Test
             int eachCount = 1;
-            new Field(eachCount).Init();
-            new Where(eachCount).Init();
-            new Method(eachCount).Init();
-            new JoinQuery(eachCount).Init();
-            new SingleQuery(eachCount).Init();
-            new SelectQuery(eachCount).Init();
-
+            //new Field(eachCount).Init();
+            //new Where(eachCount).Init();
+            //new Method(eachCount).Init();
+            //new JoinQuery(eachCount).Init();
+            //new SingleQuery(eachCount).Init();
+            //new SelectQuery(eachCount).Init();
+            new MapTable().Init();
 
             //Performance Test
             for (int i = 0; i < 100; i++)
diff --git a/OrmTest/UnitTest/RenameMapping/MapColumn.cs b/OrmTest/UnitTest/RenameMapping/MapColumn.cs
new file mode 100644
index 000000000..9ed1b4f51
--- /dev/null
+++ b/OrmTest/UnitTest/RenameMapping/MapColumn.cs
@@ -0,0 +1,18 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OrmTest.UnitTest
+{
+    public class MapColumn : ExpTestBase
+    {
+        public SqlSugarClient GetInstance()
+        {
+            SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer });
+            return db;
+        }
+    }
+}
diff --git a/OrmTest/UnitTest/RenameMapping/MapTable.cs b/OrmTest/UnitTest/RenameMapping/MapTable.cs
new file mode 100644
index 000000000..adb7dd158
--- /dev/null
+++ b/OrmTest/UnitTest/RenameMapping/MapTable.cs
@@ -0,0 +1,26 @@
+using OrmTest.Models;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OrmTest.UnitTest
+{
+    public class MapTable : ExpTestBase
+    {
+        public void Init()
+        {
+            using (var db = GetInstance())
+            {
+               var x= db.Queryable<Student>().ToList();
+            }
+        }
+        public SqlSugarClient GetInstance()
+        {
+            SqlSugarClient db = new SqlSugarClient(new SystemTablesConfig() { ConnectionString = Config.ConnectionString, DbType = DbType.SqlServer, IsAutoCloseConnection = true });
+            return db;
+        }
+    }
+}
diff --git a/SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/DeleteBuilder.cs b/SqlSugar/Abstract/DbProvider/SqlBuilderProvider/DMLBuilder/DeleteBuilder.cs
similarity index 100%
rename from SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/DeleteBuilder.cs
rename to SqlSugar/Abstract/DbProvider/SqlBuilderProvider/DMLBuilder/DeleteBuilder.cs
diff --git a/SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/InsertBuilder.cs b/SqlSugar/Abstract/DbProvider/SqlBuilderProvider/DMLBuilder/InsertBuilder.cs
similarity index 100%
rename from SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/InsertBuilder.cs
rename to SqlSugar/Abstract/DbProvider/SqlBuilderProvider/DMLBuilder/InsertBuilder.cs
diff --git a/SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/QueryBuilder.cs b/SqlSugar/Abstract/DbProvider/SqlBuilderProvider/DMLBuilder/QueryBuilder.cs
similarity index 100%
rename from SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/QueryBuilder.cs
rename to SqlSugar/Abstract/DbProvider/SqlBuilderProvider/DMLBuilder/QueryBuilder.cs
diff --git a/SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/SqlQueryBuilder.cs b/SqlSugar/Abstract/DbProvider/SqlBuilderProvider/DMLBuilder/SqlQueryBuilder.cs
similarity index 100%
rename from SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/SqlQueryBuilder.cs
rename to SqlSugar/Abstract/DbProvider/SqlBuilderProvider/DMLBuilder/SqlQueryBuilder.cs
diff --git a/SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/UpdateBuilder.cs b/SqlSugar/Abstract/DbProvider/SqlBuilderProvider/DMLBuilder/UpdateBuilder.cs
similarity index 100%
rename from SqlSugar/Abstract/SqlBuilderProvider/DMLBuilder/UpdateBuilder.cs
rename to SqlSugar/Abstract/DbProvider/SqlBuilderProvider/DMLBuilder/UpdateBuilder.cs
diff --git a/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderAccessory.cs b/SqlSugar/Abstract/DbProvider/SqlBuilderProvider/SqlBuilderAccessory.cs
similarity index 100%
rename from SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderAccessory.cs
rename to SqlSugar/Abstract/DbProvider/SqlBuilderProvider/SqlBuilderAccessory.cs
diff --git a/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs b/SqlSugar/Abstract/DbProvider/SqlBuilderProvider/SqlBuilderProvider.cs
similarity index 100%
rename from SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs
rename to SqlSugar/Abstract/DbProvider/SqlBuilderProvider/SqlBuilderProvider.cs
diff --git a/SqlSugar/SqlSugar.csproj b/SqlSugar/SqlSugar.csproj
index 4bed2cef1..b9d333831 100644
--- a/SqlSugar/SqlSugar.csproj
+++ b/SqlSugar/SqlSugar.csproj
@@ -57,13 +57,13 @@
     <Compile Include="Abstract\QueryableProvider\QueryableAccessory.cs" />
     <Compile Include="Abstract\QueryableProvider\QueryableExtendsions.cs" />
     <Compile Include="Abstract\QueryableProvider\QueryableProvider.cs" />
-    <Compile Include="Abstract\SqlBuilderProvider\DMLBuilder\DeleteBuilder.cs" />
-    <Compile Include="Abstract\SqlBuilderProvider\DMLBuilder\InsertBuilder.cs" />
-    <Compile Include="Abstract\SqlBuilderProvider\DMLBuilder\QueryBuilder.cs" />
-    <Compile Include="Abstract\SqlBuilderProvider\DMLBuilder\SqlQueryBuilder.cs" />
-    <Compile Include="Abstract\SqlBuilderProvider\DMLBuilder\UpdateBuilder.cs" />
-    <Compile Include="Abstract\SqlBuilderProvider\SqlBuilderAccessory.cs" />
-    <Compile Include="Abstract\SqlBuilderProvider\SqlBuilderProvider.cs" />
+    <Compile Include="Abstract\DbProvider\SqlBuilderProvider\DMLBuilder\DeleteBuilder.cs" />
+    <Compile Include="Abstract\DbProvider\SqlBuilderProvider\DMLBuilder\InsertBuilder.cs" />
+    <Compile Include="Abstract\DbProvider\SqlBuilderProvider\DMLBuilder\QueryBuilder.cs" />
+    <Compile Include="Abstract\DbProvider\SqlBuilderProvider\DMLBuilder\SqlQueryBuilder.cs" />
+    <Compile Include="Abstract\DbProvider\SqlBuilderProvider\DMLBuilder\UpdateBuilder.cs" />
+    <Compile Include="Abstract\DbProvider\SqlBuilderProvider\SqlBuilderAccessory.cs" />
+    <Compile Include="Abstract\DbProvider\SqlBuilderProvider\SqlBuilderProvider.cs" />
     <Compile Include="Common\CacheManager.cs" />
     <Compile Include="Common\Check.cs" />
     <Compile Include="Common\CommonExtensions.cs" />