!16 解决mysql无法查看存储过程的bug及mysql更新列注释的功能

Merge pull request !16 from micLuo/develop
JcongJason · Mar 29, 2023 · 70d63c4 · 70d63c4
2 parents fea840b + 85767ce
commit 70d63c4
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 14 deletions.
diff --git a/Lib/SqlSugar.dll b/Lib/SqlSugar.dll
diff --git a/SmartSQL/SmartSQL.Framework/Exporter/DmExporter.cs b/SmartSQL/SmartSQL.Framework/Exporter/DmExporter.cs
@@ -292,7 +292,7 @@ public override string SelectSql()
             throw new NotImplementedException();
         }
 
-        public override bool UpdateColumnRemark(Column columnInfo, string remark)
+        public override bool UpdateColumnRemark(Column columnInfo, string remark, DbObjectType objectType = DbObjectType.Table)
         {
             throw new NotImplementedException();
         }

diff --git a/SmartSQL/SmartSQL.Framework/Exporter/Exporter.cs b/SmartSQL/SmartSQL.Framework/Exporter/Exporter.cs
@@ -79,7 +79,7 @@ public Exporter(string tableName, List<Column> columns)
         /// <param name="columnInfo"></param>
         /// <param name="remark"></param>
         /// <returns></returns>
-        public abstract bool UpdateColumnRemark(Column columnInfo, string remark);
+        public abstract bool UpdateColumnRemark(Column columnInfo, string remark, DbObjectType objectType = DbObjectType.Table);
         /// <summary>
         /// 创建表SQL
         /// </summary>

diff --git a/SmartSQL/SmartSQL.Framework/Exporter/IExporter.cs b/SmartSQL/SmartSQL.Framework/Exporter/IExporter.cs
@@ -50,7 +50,7 @@ public interface IExporter
         /// <param name="columnInfo"></param>
         /// <param name="remark"></param>
         /// <returns></returns>
-        bool UpdateColumnRemark(Column columnInfo, string remark);
+        bool UpdateColumnRemark(Column columnInfo, string remark, DbObjectType objectType = DbObjectType.Table);
         /// <summary>
         /// 创建表SQL
         /// </summary>

diff --git a/SmartSQL/SmartSQL.Framework/Exporter/MySqlExporter.cs b/SmartSQL/SmartSQL.Framework/Exporter/MySqlExporter.cs
@@ -204,6 +204,7 @@ public override Columns GetColumnInfoById(string objectId)
                 column.IsNullable = v.IsNullable;
                 column.DefaultValue = !string.IsNullOrEmpty(v.DefaultValue) && v.DefaultValue.Contains("((") ? v.DefaultValue.Replace("((", "").Replace("))", "") : v.DefaultValue;
                 column.DataType = v.DataType;
+                column.Length = v.Length;
                 column.OriginalName = v.DbColumnName;
                 column.Comment = v.ColumnDescription;
                 column.IsPrimaryKey = v.IsPrimarykey;
@@ -256,9 +257,34 @@ public override bool UpdateObjectRemark(string objectName, string remark, DbObje
         /// <param name="columnInfo"></param>
         /// <param name="remark"></param>
         /// <returns></returns>
-        public override bool UpdateColumnRemark(Column columnInfo, string remark)
+        public override bool UpdateColumnRemark(Column columnInfo, string remark, DbObjectType objectType = DbObjectType.Table)
         {
-            throw new NotSupportedException();
+            var result = false;
+            if (objectType == DbObjectType.Table)
+            {
+                var dbColumn = new DbColumnInfo()
+                {
+                    TableName = columnInfo.ObjectId,
+                    DbColumnName = columnInfo.DisplayName,
+                    IsIdentity = columnInfo.IsIdentity,
+                    IsPrimarykey = columnInfo.IsPrimaryKey,
+                    IsNullable = columnInfo.IsNullable,
+                    Length = columnInfo.Length,
+                    DataType = columnInfo.DataType,
+                    DefaultValue = columnInfo.DefaultValue,
+                    ColumnDescription = remark
+                };
+                result = _dbMaintenance.AddColumnRemark(dbColumn);
+            }
+            if (objectType == DbObjectType.View)
+            {
+                throw new NotSupportedException();
+            }
+            if (objectType == DbObjectType.Proc)
+            {
+                throw new NotSupportedException();
+            }
+            return result;
         }
 
         public override string CreateTableSql()

diff --git a/SmartSQL/SmartSQL.Framework/Exporter/OracleExporter.cs b/SmartSQL/SmartSQL.Framework/Exporter/OracleExporter.cs
@@ -227,7 +227,7 @@ public override bool UpdateObjectRemark(string objectName, string remark, DbObje
         /// <param name="columnName"></param>
         /// <param name="remark"></param>
         /// <returns></returns>
-        public override bool UpdateColumnRemark(Column columnInfo, string remark)
+        public override bool UpdateColumnRemark(Column columnInfo, string remark, DbObjectType objectType = DbObjectType.Table)
         {
             throw new NotImplementedException();
         }

diff --git a/SmartSQL/SmartSQL.Framework/Exporter/PostgreSqlExporter.cs b/SmartSQL/SmartSQL.Framework/Exporter/PostgreSqlExporter.cs
@@ -272,7 +272,7 @@ public override bool UpdateObjectRemark(string objectName, string remark, DbObje
         /// <param name="columnName"></param>
         /// <param name="remark"></param>
         /// <returns></returns>
-        public override bool UpdateColumnRemark(Column columnInfo, string remark)
+        public override bool UpdateColumnRemark(Column columnInfo, string remark, DbObjectType objectType = DbObjectType.Table)
         {
             throw new NotImplementedException();
         }

diff --git a/SmartSQL/SmartSQL.Framework/Exporter/SqlServerExporter.cs b/SmartSQL/SmartSQL.Framework/Exporter/SqlServerExporter.cs
@@ -472,7 +472,7 @@ public override bool UpdateObjectRemark(string objectName, string remark, DbObje
         /// <param name="columnInfo"></param>
         /// <param name="remark"></param>
         /// <returns></returns>
-        public override bool UpdateColumnRemark(Column columnInfo, string remark)
+        public override bool UpdateColumnRemark(Column columnInfo, string remark, DbObjectType objectType = DbObjectType.Table)
         {
             var columnName = columnInfo.Name;
             var tableName = columnInfo.ObjectName;

diff --git a/SmartSQL/SmartSQL.Framework/Exporter/SqliteExporter.cs b/SmartSQL/SmartSQL.Framework/Exporter/SqliteExporter.cs
@@ -128,7 +128,7 @@ public override bool UpdateObjectRemark(string objectName, string remark, DbObje
         /// <param name="columnInfo"></param>
         /// <param name="remark"></param>
         /// <returns></returns>
-        public override bool UpdateColumnRemark(Column columnInfo, string remark)
+        public override bool UpdateColumnRemark(Column columnInfo, string remark, DbObjectType objectType = DbObjectType.Table)
         {
             throw new NotImplementedException();
         }

diff --git a/SmartSQL/SmartSQL/UserControl/Main/UcMainColumns.xaml.cs b/SmartSQL/SmartSQL/UserControl/Main/UcMainColumns.xaml.cs
@@ -133,7 +133,7 @@ public void LoadPageData()
                 var objName = isView ? "视图" : "表";
                 TabStruct.Header = objName;
                 TabData.Header = objName;
-                var dbInstance = ExporterFactory.CreateInstance(selectedConnection.DbType, dbConnectionString,selectedDatabase.DbName);
+                var dbInstance = ExporterFactory.CreateInstance(selectedConnection.DbType, dbConnectionString, selectedDatabase.DbName);
                 Task.Run(() =>
                 {
                     var tableColumns = dbInstance.GetColumnInfoById(selectedObject.ObejcetId);
@@ -173,7 +173,7 @@ public void LoadPageData()
                 TabCode.Visibility = Visibility.Collapsed;
                 TabSql.Visibility = Visibility.Visible;
                 TabTable.SelectedItem = TabSql;
-                var dbInstance = ExporterFactory.CreateInstance(selectedConnection.DbType, dbConnectionString,selectedDatabase.DbName);
+                var dbInstance = ExporterFactory.CreateInstance(selectedConnection.DbType, dbConnectionString, selectedDatabase.DbName);
                 Task.Run(() =>
                 {
                     var script = dbInstance.GetScriptInfoById(selectedObject.ObejcetId, DbObjectType.Proc);
@@ -218,7 +218,7 @@ private void TabTable_OnSelectionChanged(object sender, SelectionChangedEventArg
             if (selectedItem.Name.Equals("TabData"))
             {
                 var connectionString = SelectedConnection.DbMasterConnectString;
-                var exporter = ExporterFactory.CreateInstance(SelectedConnection.DbType, connectionString,SelectedDataBase.DbName);
+                var exporter = ExporterFactory.CreateInstance(SelectedConnection.DbType, connectionString, SelectedDataBase.DbName);
                 if (TabData.IsSelected)
                 {
                     SearchTableExt2.Text = "";
@@ -309,8 +309,9 @@ private void TableGrid_OnCellEditEnding(object sender, DataGridCellEditEndingEve
                     var dbConnectionString = SelectedConnection.SelectedDbConnectString(SelectedDataBase.DbName);
                     try
                     {
-                        var dbInstance = ExporterFactory.CreateInstance(SelectedConnection.DbType, dbConnectionString,SelectedDataBase.DbName);
-                        var editResult = dbInstance.UpdateColumnRemark(selectItem, newValue);
+                        var dbInstance = ExporterFactory.CreateInstance(SelectedConnection.DbType, dbConnectionString, SelectedDataBase.DbName);
+                        var objectType = SelectedObject.Type.Equals(ObjType.Table) ? DbObjectType.Table : (SelectedObject.Type.Equals(ObjType.View) ? DbObjectType.View : DbObjectType.Proc);
+                        var editResult = dbInstance.UpdateColumnRemark(selectItem, newValue, objectType);
                         if (editResult)
                             Oops.Success("修改成功");
                         else