From a97843b3b66f66b13870921130f4d8cdc347a772 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Tue, 4 Jun 2019 13:22:37 +0800
Subject: [PATCH] Update demo

---
 .../MySqlTest/Demo/Demo0_SqlSugarClient.cs    |  2 +-
 .../MySqlTest/Models/AttributeTable.cs        | 20 +++++++
 Src/Asp.Net/MySqlTest/Models/EntityMapper.cs  | 15 ++++++
 Src/Asp.Net/MySqlTest/Models/Mapper.cs        | 54 +++++++++++++++++++
 Src/Asp.Net/MySqlTest/Models/Order.cs         | 11 ++--
 Src/Asp.Net/MySqlTest/Models/TestTree.cs      | 17 ++++++
 .../MySqlTest/Models/{Mappers.cs => Tree.cs}  |  0
 Src/Asp.Net/MySqlTest/MySqlTest.csproj        |  6 ++-
 8 files changed, 119 insertions(+), 6 deletions(-)
 create mode 100644 Src/Asp.Net/MySqlTest/Models/AttributeTable.cs
 create mode 100644 Src/Asp.Net/MySqlTest/Models/EntityMapper.cs
 create mode 100644 Src/Asp.Net/MySqlTest/Models/Mapper.cs
 create mode 100644 Src/Asp.Net/MySqlTest/Models/TestTree.cs
 rename Src/Asp.Net/MySqlTest/Models/{Mappers.cs => Tree.cs} (100%)

diff --git a/Src/Asp.Net/MySqlTest/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.Net/MySqlTest/Demo/Demo0_SqlSugarClient.cs
index da891e5e5..5a06f8fcf 100644
--- a/Src/Asp.Net/MySqlTest/Demo/Demo0_SqlSugarClient.cs
+++ b/Src/Asp.Net/MySqlTest/Demo/Demo0_SqlSugarClient.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Data.Linq.Mapping;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
diff --git a/Src/Asp.Net/MySqlTest/Models/AttributeTable.cs b/Src/Asp.Net/MySqlTest/Models/AttributeTable.cs
new file mode 100644
index 000000000..c1a43ad12
--- /dev/null
+++ b/Src/Asp.Net/MySqlTest/Models/AttributeTable.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+
+namespace OrmTest
+{
+    [Table("MyAttributeTable")]
+    //[SugarTable("CustomAttributeTable")]
+    public class  AttributeTable
+    {
+
+        [Key]
+        //[SugarColumn(IsPrimaryKey =true)]
+        public string Id { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/Src/Asp.Net/MySqlTest/Models/EntityMapper.cs b/Src/Asp.Net/MySqlTest/Models/EntityMapper.cs
new file mode 100644
index 000000000..b597012fb
--- /dev/null
+++ b/Src/Asp.Net/MySqlTest/Models/EntityMapper.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SqlSugar;
+namespace OrmTest
+{
+    [SugarTable("MyEntityMapper")]
+    public class EntityMapper
+    {
+        [SugarColumn(ColumnName ="MyName")]
+        public string Name { get; set; }
+    }
+}
diff --git a/Src/Asp.Net/MySqlTest/Models/Mapper.cs b/Src/Asp.Net/MySqlTest/Models/Mapper.cs
new file mode 100644
index 000000000..8d7991d6c
--- /dev/null
+++ b/Src/Asp.Net/MySqlTest/Models/Mapper.cs
@@ -0,0 +1,54 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OrmTest
+{
+    [SugarTable("OrderDetail")]
+    public class OrderItemInfo
+    {
+        [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int ItemId { get; set; }
+        public int OrderId { get; set; }
+        public decimal? Price { get; set; }
+        [SqlSugar.SugarColumn(IsNullable = true)]
+        public DateTime? CreateTime { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public Order Order { get; set; }
+    }
+    [SugarTable("Order")]
+    public class OrderInfo
+    {
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+        public string Name { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public List<OrderItem> Items { get; set; }
+    }
+    public class ABMapping
+    {
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int AId { get; set; }
+        public int BId { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public A A { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public B B { get; set; }
+
+    }
+    public class A
+    {
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+    public class B
+    {
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/Src/Asp.Net/MySqlTest/Models/Order.cs b/Src/Asp.Net/MySqlTest/Models/Order.cs
index c03613669..d7ff068b8 100644
--- a/Src/Asp.Net/MySqlTest/Models/Order.cs
+++ b/Src/Asp.Net/MySqlTest/Models/Order.cs
@@ -1,4 +1,5 @@
-using System;
+using SqlSugar;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,14 +9,16 @@ namespace OrmTest
 
     public class Order
     {
-        [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
         public int Id { get; set; }
 
         public string Name { get; set; }
         public decimal Price { get; set; }
-        [SqlSugar.SugarColumn(IsNullable = true)]
+        [SugarColumn(IsNullable = true)]
         public DateTime CreateTime { get; set; }
-        [SqlSugar.SugarColumn(IsNullable =true)]
+        [SugarColumn(IsNullable =true)]
         public int CustomId { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public List<OrderItem> Items { get; set; }
     }
 }
diff --git a/Src/Asp.Net/MySqlTest/Models/TestTree.cs b/Src/Asp.Net/MySqlTest/Models/TestTree.cs
new file mode 100644
index 000000000..b8250828a
--- /dev/null
+++ b/Src/Asp.Net/MySqlTest/Models/TestTree.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OrmTest
+{
+    public class TestTree
+    {
+        [SqlSugar.SugarColumn(ColumnDataType = "hierarchyid")]
+        public string TreeId { get; set; }
+        [SqlSugar.SugarColumn(ColumnDataType = "Geography")]
+        public string GId { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/Src/Asp.Net/MySqlTest/Models/Mappers.cs b/Src/Asp.Net/MySqlTest/Models/Tree.cs
similarity index 100%
rename from Src/Asp.Net/MySqlTest/Models/Mappers.cs
rename to Src/Asp.Net/MySqlTest/Models/Tree.cs
diff --git a/Src/Asp.Net/MySqlTest/MySqlTest.csproj b/Src/Asp.Net/MySqlTest/MySqlTest.csproj
index 3dbff7138..71fbf040c 100644
--- a/Src/Asp.Net/MySqlTest/MySqlTest.csproj
+++ b/Src/Asp.Net/MySqlTest/MySqlTest.csproj
@@ -67,12 +67,16 @@
     <Compile Include="Demo\DemoE_CodeFirst.cs" />
     <Compile Include="Demo\DemoF_Utilities.cs" />
     <Compile Include="Demo\DemoG_SimpleClient.cs" />
+    <Compile Include="Models\AttributeTable.cs" />
     <Compile Include="Models\CarType.cs" />
     <Compile Include="Models\Custom.cs" />
-    <Compile Include="Models\Mappers.cs" />
+    <Compile Include="Models\EntityMapper.cs" />
+    <Compile Include="Models\Mapper.cs" />
     <Compile Include="Models\MyCustomAttributeTable.cs" />
     <Compile Include="Models\Order.cs" />
     <Compile Include="Models\OrderItem.cs" />
+    <Compile Include="Models\TestTree.cs" />
+    <Compile Include="Models\Tree.cs" />
     <Compile Include="Models\ViewOrder.cs" />
     <Compile Include="OldTests\Demos\1_Query.cs" />
     <Compile Include="OldTests\Demos\2_Update.cs" />