From 4ec8dcdbb132062dcba5fc41898ab5f0628d8a78 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Fri, 10 Nov 2023 14:16:42 +0800
Subject: [PATCH] Update TDengine

---
 Src/Asp.NetCore2/SqlSugar.TDengineCore/STable.cs       | 10 ++++++++--
 .../SqlSugar.TDengineCore/SqlSugar.OdbcCore.nuspec     |  2 +-
 .../TDengine/DbMaintenance/TDengineDbMaintenance.cs    | 10 ++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Src/Asp.NetCore2/SqlSugar.TDengineCore/STable.cs b/Src/Asp.NetCore2/SqlSugar.TDengineCore/STable.cs
index 35f0829df..ac443eab1 100644
--- a/Src/Asp.NetCore2/SqlSugar.TDengineCore/STable.cs
+++ b/Src/Asp.NetCore2/SqlSugar.TDengineCore/STable.cs
@@ -6,7 +6,13 @@ namespace SqlSugar.TDengine
 {
     public class STable
     {
-        [SugarColumn(IsOnlyIgnoreInsert =true ,IsOnlyIgnoreUpdate =true)]
-        public string TagsTypeId { get; set; } 
+        [SugarColumn(IsOnlyIgnoreInsert = true, IsOnlyIgnoreUpdate = true)]
+        public string TagsTypeId { get; set; }
+        public static List<ColumnTagInfo> Tags = null;
+    }
+    public class ColumnTagInfo
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
     }
 }
diff --git a/Src/Asp.NetCore2/SqlSugar.TDengineCore/SqlSugar.OdbcCore.nuspec b/Src/Asp.NetCore2/SqlSugar.TDengineCore/SqlSugar.OdbcCore.nuspec
index d2eb91177..a490c7683 100644
--- a/Src/Asp.NetCore2/SqlSugar.TDengineCore/SqlSugar.OdbcCore.nuspec
+++ b/Src/Asp.NetCore2/SqlSugar.TDengineCore/SqlSugar.OdbcCore.nuspec
@@ -9,7 +9,7 @@
     <projectUrl>https://github.com/sunkaixuan/SqlSugar</projectUrl>
     <iconUrl>https://secure.gravatar.com/avatar/a82c03402497b2e58fd65038a3699b30</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description> SqlSugar TDengine 核心库 </description>
+    <description> SqlSugar TDengine 核心库 ,DEMO用例： https://github.com/DotNetNext/SqlSugar </description>
     <copyright>Copyright 2016</copyright>
     <tags>TDengine Tdengine tdengine</tags>
     <dependencies>
diff --git a/Src/Asp.NetCore2/SqlSugar.TDengineCore/TDengine/DbMaintenance/TDengineDbMaintenance.cs b/Src/Asp.NetCore2/SqlSugar.TDengineCore/TDengine/DbMaintenance/TDengineDbMaintenance.cs
index c0f661136..7677840df 100644
--- a/Src/Asp.NetCore2/SqlSugar.TDengineCore/TDengine/DbMaintenance/TDengineDbMaintenance.cs
+++ b/Src/Asp.NetCore2/SqlSugar.TDengineCore/TDengine/DbMaintenance/TDengineDbMaintenance.cs
@@ -414,8 +414,18 @@ namespace SqlSugar.TDengine
             string tableString = string.Format(this.CreateTableSql, this.SqlBuilder.GetTranslationTableName("STable_"+tableName.ToLower(isAutoToLowerCodeFirst)), string.Join(",\r\n", columnArray));
             var childTableName = this.SqlBuilder.GetTranslationTableName(tableName.ToLower(isAutoToLowerCodeFirst));
             var stableName =  this.SqlBuilder.GetTranslationTableName("STable_"+tableName.ToLower(isAutoToLowerCodeFirst));
+            if (STable.Tags?.Any() == true) 
+            {
+                var colums = STable.Tags.Select(it => this.SqlBuilder.GetTranslationTableName(it.Name)+ "  VARCHAR(20) ");
+                tableString=tableString.Replace(SqlBuilder.GetTranslationColumnName("TagsTypeId"), string.Join(",", colums)); ;
+            }
             this.Context.Ado.ExecuteCommand(tableString);
             var createChildSql = $"CREATE TABLE IF NOT EXISTS     {childTableName} USING {stableName} TAGS('default')";
+            if (STable.Tags?.Any() == true)
+            {
+                var colums = STable.Tags.Select(it => it.Value.ToSqlValue());
+                createChildSql = tableString.Replace("TAGS('default')", $"TAGS({string.Join(",", colums)})"); ;
+            }
             this.Context.Ado.ExecuteCommand(createChildSql);
             return tableString;
         }