From 34824235aa51c77ad5fb38729bb12af3d0af170c Mon Sep 17 00:00:00 2001
From: "610262374@qq.com" <sunkaixuan>
Date: Mon, 10 Jun 2019 10:28:28 +0800
Subject: [PATCH] Update PgSql

---
 Src/Asp.Net/PgSqlTest/PgSqlTest.csproj        |  1 +
 Src/Asp.Net/PgSqlTest/UnitTest/Main.cs        |  1 +
 Src/Asp.Net/PgSqlTest/UnitTest/USave.cs       | 95 +++++++++++++++++++
 .../Insertable/PostgreSQLInserttable.cs       |  8 +-
 4 files changed, 101 insertions(+), 4 deletions(-)
 create mode 100644 Src/Asp.Net/PgSqlTest/UnitTest/USave.cs

diff --git a/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj b/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj
index 78a3f13da..bd474a8e1 100644
--- a/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj
+++ b/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj
@@ -89,6 +89,7 @@
     <Compile Include="Models\Tree.cs" />
     <Compile Include="Models\ViewOrder.cs" />
     <Compile Include="Config.cs" />
+    <Compile Include="UnitTest\USave.cs" />
     <Compile Include="_OldTest\Demos\1_Query.cs" />
     <Compile Include="_OldTest\Demos\2_Update.cs" />
     <Compile Include="_OldTest\Demos\3_Insert.cs" />
diff --git a/Src/Asp.Net/PgSqlTest/UnitTest/Main.cs b/Src/Asp.Net/PgSqlTest/UnitTest/Main.cs
index 269bae0f5..095aba739 100644
--- a/Src/Asp.Net/PgSqlTest/UnitTest/Main.cs
+++ b/Src/Asp.Net/PgSqlTest/UnitTest/Main.cs
@@ -31,6 +31,7 @@ namespace OrmTest
         }
         public static void Init()
         {
+            Save();
             CodeFirst();
             Updateable();
             Json();
diff --git a/Src/Asp.Net/PgSqlTest/UnitTest/USave.cs b/Src/Asp.Net/PgSqlTest/UnitTest/USave.cs
new file mode 100644
index 000000000..98a05561d
--- /dev/null
+++ b/Src/Asp.Net/PgSqlTest/UnitTest/USave.cs
@@ -0,0 +1,95 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OrmTest
+{
+    public partial class NewUnitTest
+    {
+        public static void Save()
+        {
+            Db.CodeFirst.InitTables<UnitSysMenu>();
+            Db.DbMaintenance.TruncateTable<UnitSysMenu>();
+            Db.Saveable<UnitSysMenu>(new UnitSysMenu() { ID="aa", ButtonList="", CreateName="a", CreateTime=DateTime.Now, ImageUrl="", IsDel=true, MenuCode="a", NavigateUrl="a", UpdateName="", Remark="", UpdateTime=DateTime.Now }).ExecuteReturnEntity();
+        }
+    }
+    public class BaseEntity 
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, ColumnDescription = "ID", Length = 32)]
+        public string ID { get; set; }
+        /// <summary>
+        /// 删除标记
+        /// </summary>
+        [ SugarColumn(ColumnDescription = "删除标记")]
+        public bool IsDel { get; set; }
+        /// <summary>
+        /// 排序字段
+        /// </summary>
+        [SugarColumn(ColumnDescription = "排序字段", IsIdentity = true)]
+        public int SortIndex { get; set; }
+        /// <summary>
+        /// 添加操作员
+        /// </summary>
+        [ SugarColumn(ColumnDescription = "添加操作员", Length = 10, IsNullable = true)]
+        public string CreateName { get; set; }
+        /// <summary>
+        /// 添加时间
+        /// </summary>
+        [ SugarColumn(ColumnDescription = "添加时间", IsNullable = true)]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改操作员
+        /// </summary>
+        [ SugarColumn(ColumnDescription = "修改操作员", Length = 10, IsNullable = true)]
+        public string UpdateName { get; set; }
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        [ SugarColumn(ColumnDescription = "修改时间", IsNullable = true)]
+        public DateTime? UpdateTime { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [SugarColumn(ColumnDescription = "备注", Length = 150, IsNullable = true)]
+        public string Remark { get; set; }
+    }
+    public class UnitSysMenu : BaseEntity
+    {
+        public UnitSysMenu()
+        {
+        }
+        /// <summary>
+        /// 菜单图标
+        /// </summary>
+        [SqlSugar.SugarColumn(Length = 150, ColumnDescription = "菜单图标")]
+
+        public string ImageUrl { get; set; }
+        /// <summary>
+        /// 菜单编码
+        /// </summary>
+        [SqlSugar.SugarColumn(Length = 50, ColumnDescription = "菜单编码")]
+        public string MenuCode { get; set; }
+        /// <summary>
+        /// 菜单地址
+        /// </summary>
+        [ SqlSugar.SugarColumn(Length = 200, IsNullable = true, ColumnDescription = "菜单地址")]
+        public string NavigateUrl { get; set; }
+        /// <summary>
+        /// 菜单功能
+        /// </summary>
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public string ButtonList { get; set; }
+
+        /// <summary>
+        /// 排序字段
+        /// </summary>
+        [SugarColumn(ColumnDescription = "排序字段", IsIdentity = true)]
+        public int SortIndex { get; set; }
+    }
+}
diff --git a/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/Insertable/PostgreSQLInserttable.cs b/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/Insertable/PostgreSQLInserttable.cs
index 1a7a97348..06ddf6d04 100644
--- a/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/Insertable/PostgreSQLInserttable.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/Insertable/PostgreSQLInserttable.cs
@@ -13,7 +13,7 @@ namespace SqlSugar
         {
             InsertBuilder.IsReturnIdentity = true;
             PreToSql();
-            string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", GetPrimaryKeys().FirstOrDefault());
+            string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", GetIdentityKeys().FirstOrDefault());
             RestoreMapping();
             var result = Ado.GetScalar(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()).ObjToInt();
             return result;
@@ -22,7 +22,7 @@ namespace SqlSugar
         {
             InsertBuilder.IsReturnIdentity = true;
             PreToSql();
-            string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", GetPrimaryKeys().FirstOrDefault());
+            string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", GetIdentityKeys().FirstOrDefault());
             RestoreMapping();
             var obj = await Ado.GetScalarAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray());
             var result = obj.ObjToInt();
@@ -38,7 +38,7 @@ namespace SqlSugar
         {
             InsertBuilder.IsReturnIdentity = true;
             PreToSql();
-            string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", GetPrimaryKeys().FirstOrDefault());
+            string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", GetIdentityKeys().FirstOrDefault());
             RestoreMapping();
             var result = Convert.ToInt64(Ado.GetScalar(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()) ?? "0");
             return result;
@@ -47,7 +47,7 @@ namespace SqlSugar
         {
             InsertBuilder.IsReturnIdentity = true;
             PreToSql();
-            string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", GetPrimaryKeys().FirstOrDefault());
+            string sql = InsertBuilder.ToSqlString().Replace("$PrimaryKey", GetIdentityKeys().FirstOrDefault());
             RestoreMapping();
             var result = Convert.ToInt64(await Ado.GetScalarAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()) ?? "0");
             return result;