fix bug

Author: topcoder520

Context/ContextUtils.cs

@@ -111,11 +111,12 @@ public static bool TestConnectDB(EnumDatabase enumDatabase, string connectString
             return true;
         }
 
+        private static Dictionary<string, EnumDatabase> kvEnum = new Dictionary<string, EnumDatabase>();
+
         public static DBConnect CreateConnectDB(EnumDatabase enumDatabase,string Key, string connectString)
         {
             try
             {
-                //string Key = MD5Helper.EncryptString(connectString);
                 IFreeSql? freeSql;
                 if(!keyValueDataBase.TryGetValue(Key, out freeSql))
                 {
@@ -124,7 +125,8 @@ public static DBConnect CreateConnectDB(EnumDatabase enumDatabase,string Key, st
                         return new KeyValArgs(Key, connectString);
                     });
                 }
-                return new DBConnect(freeSql);
+                kvEnum.Add(Key,enumDatabase);
+                return new DBConnect(freeSql,enumDatabase);
             }
             catch (Exception e)
             {
@@ -137,7 +139,8 @@ public static DBConnect CreateConnectDB(EnumDatabase enumDatabase,string Key, st
             IFreeSql? freeSql;
             if (keyValueDataBase.TryGetValue(Key, out freeSql))
             {
-                return new DBConnect(freeSql);
+                EnumDatabase enumDatabase =  kvEnum[Key];
+                return new DBConnect(freeSql,enumDatabase);
             }
             return null;
         }

Context/DBConnect.cs

@@ -1,4 +1,5 @@
-using FreeSql.DatabaseModel;
+using DataDefine;
+using FreeSql.DatabaseModel;
 using MySqlX.XDevAPI;
 using System;
 using System.Collections.Generic;
@@ -15,8 +16,13 @@ public class DBConnect
 
         private Exception? error { get; set; }
 
-        public DBConnect(IFreeSql? freeSql) {
+        private EnumDatabase _dataType { get; set; }
+
+        public EnumDatabase DataType { get { return _dataType; } }
+
+        public DBConnect(IFreeSql? freeSql,EnumDatabase dataType) {
             this.freeSql = freeSql;
+            _dataType = dataType;
         }
 
         public DBConnect(IFreeSql? freeSql,Exception? e)
@@ -152,7 +158,19 @@ public List<List<string>> GetColInfos(string tableName)
 
         public DataTable ExeQueryBySQL(string sql,object parms = null)
         {
-            return freeSql.Ado.ExecuteDataTable(sql,parms);
+            //限制最多一千条数据
+            string limitSql = string.Empty;
+            if(_dataType == EnumDatabase.Mysql || _dataType == EnumDatabase.SqlLite)
+            {
+                limitSql = $"SELECT * FROM ({sql}) a LIMIT 1000";
+            }else if(_dataType == EnumDatabase.Sqlserver)
+            {
+                limitSql = $"SELECT TOP 1000 * FROM ({sql}) a";
+            }
+            return freeSql.Ado.ExecuteDataTable(limitSql, parms);
         }
+
+
+
     }
 }

FreesqlGenCode/controls/FsShowTables.Designer.cs

@@ -1,4 +1,5 @@
-using Model;
+using Context;
+using Model;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -86,13 +87,20 @@ private void button2_Click(object sender, EventArgs e)
                 MessageBox.Show("请添加节点");
                 return;
             }
-            string sql = fsShowTables.GetSql(firstTableNode);
+            
             //找出所有查询的字段
             List<string> lstQueryField = new List<string>();
             fsShowTables.GetQueryFieldOfChildNodes(lstQueryField,firstTableNode);
 
             TreeNode node = fsShowTables.Tag as TreeNode;
             FsDatabase fsDatabase = (FsDatabase)node.Tag;
+            DBConnect dBConnect = ContextUtils.GetDBConnect(fsDatabase.DBKey);
+            if (!dBConnect.TestConnect())
+            {
+                MessageBox.Show("数据库连接无效!");
+                return;
+            }
+            string sql = fsShowTables.GetSql(firstTableNode,dBConnect.DataType);
 
             FormGenSql genSql = new FormGenSql();
             genSql.Text = "生成SQL";