0.0.6

Author: zhaoqiangqiang

DataProviders/HiDb.DataProvider.MySql/MainDataProvider.cs

@@ -5,7 +5,7 @@ namespace HiDb.DataProvider.MySql
     public class MainDataProvider
     {
         public async Task<List<T>> GetListAsync<T>(string sql, 
-            CancellationToken cancellationToken = default, string database = "")
+            CancellationToken cancellationToken = default, string? database = "")
         {
             if (string.IsNullOrWhiteSpace(sql))
             {
@@ -17,7 +17,7 @@ public async Task<List<T>> GetListAsync<T>(string sql,
         }
 
         public async Task<long> GetCountAsync(string sql, CancellationToken cancellationToken = default,
-            string database = "")
+            string? database = "")
         {
             if (string.IsNullOrWhiteSpace(sql))
             {
@@ -29,7 +29,7 @@ public async Task<long> GetCountAsync(string sql, CancellationToken cancellation
         }
 
         public async Task<List<dynamic>> GetListAsync(string sql, CancellationToken cancellationToken = default,
-            string database = "")
+            string? database = "")
         {
             if (string.IsNullOrWhiteSpace(sql))
             {
@@ -41,7 +41,7 @@ public async Task<List<dynamic>> GetListAsync(string sql, CancellationToken canc
         }
 
         public async Task<T> GetFirstAsync<T>(string sql, CancellationToken cancellationToken = default,
-            string database = "") where T : new()
+            string? database = "") where T : new()
         {
             if (string.IsNullOrWhiteSpace(sql))
             {

DataProviders/HiDb.DataProvider.MySql/SearchDataProvider.cs

@@ -21,12 +21,12 @@ public async Task<SearchOutput> GetSearchDataAsync(SearchInput input,
         {
             var query = input.noPage ? (input.Sql, "") : GetPageSql(input.Sql, input.PageSize.Value);
 
-            var list = await GetListAsync(query.Item1, cancellationToken);
+            var list = await GetListAsync(query.Item1, cancellationToken, input.DataBase);
             var res = new SearchOutput()
             {
                 List = list,
                 Count = string.IsNullOrWhiteSpace(query.Item2) ? list.Count :
-                    await GetCountAsync(query.Item2, cancellationToken)
+                    await GetCountAsync(query.Item2, cancellationToken, input.DataBase)
             };
             return res;
         }

DataProviders/HiDb.DataProvider.MySql/SqlConnectionFactory.cs

@@ -27,7 +27,7 @@ public static SqlConnectionFactory Get()
         }
 
         public async Task<IDbConnection> CreateConnectionAsync(CancellationToken cancellationToken = default, 
-            string database = "", string connectionString = "")
+            string? database = "", string connectionString = "")
         {
             var conn = "";
             if (string.IsNullOrWhiteSpace(connectionString))
@@ -46,7 +46,7 @@ public async Task<IDbConnection> CreateConnectionAsync(CancellationToken cancell
                 await connection.OpenAsync(cancellationToken);
                 if (!string.IsNullOrWhiteSpace(database))
                 {
-                    var useDatabaseSql = $"USE {database};";
+                    var useDatabaseSql = $"USE `{database}`;";
                     await connection.ExecuteAsync(useDatabaseSql);
                 }
 

DataProviders/HiDb.DataProvider.MySql/TableDataProvider.cs

@@ -50,7 +50,7 @@ is_nullable  AS AllowNull
                                 information_schema.columns 
                             WHERE 
                                 table_schema= '{input.DataBase}'
-                                AND table_name= '{input.Table}';", cancellationToken);
+                                AND table_name= '{input.Table}';", cancellationToken, input.DataBase);
         }
 
         public async Task<List<TableDbTypeOutput>> GetDbTypeListAsync(CancellationToken cancellationToken = default)
@@ -63,14 +63,14 @@ public async Task<List<TableDbTypeOutput>> GetDbTypeListAsync(CancellationToken
         public async Task<bool> DeleteTableAsync(string database, string mode, string table, 
             CancellationToken cancellationToken = default)
         {
-            using var connection = await SqlConnectionFactory.Get().CreateConnectionAsync(cancellationToken);
+            using var connection = await SqlConnectionFactory.Get().CreateConnectionAsync(cancellationToken, database);
             return await connection.ExecuteAsync(@$"DROP TABLE {database}.{table};") > 1;
         }
 
         public async Task<bool> UpdateColumnConfigAsync(UpdateTableColumnInput input,
             CancellationToken cancellationToken = default)
         {
-            using var connection = await SqlConnectionFactory.Get().CreateConnectionAsync(cancellationToken);
+            using var connection = await SqlConnectionFactory.Get().CreateConnectionAsync(cancellationToken, input.DataBase);
             var sql = @$"ALTER TABLE `{input.DataBase}`.`{input.Table}`
                         MODIFY COLUMN `column` [{input.Type}] {(input.Required ? "NOT NULL" : "NULL")}";
             return await connection.ExecuteAsync(sql) > 1;
@@ -79,7 +79,7 @@ public async Task<bool> UpdateColumnConfigAsync(UpdateTableColumnInput input,
         public async Task<bool> ClearTableAsync(string database, string mode, string table,
             CancellationToken cancellationToken = default)
         {
-            using var connection = await SqlConnectionFactory.Get().CreateConnectionAsync(cancellationToken);
+            using var connection = await SqlConnectionFactory.Get().CreateConnectionAsync(cancellationToken, database);
             return await connection.ExecuteAsync(@$"TRUNCATE TABLE {database}.{table}") > 1;
         }
     }

Gui/HiDb.Vue/env/.env

@@ -1,2 +1,2 @@
-API_HOST = 'http://127.0.0.1:5100'
+API_HOST = 'http://127.0.0.1:5000'
 NODE_ENV = 'development'

Gui/HiDb.Vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hidb",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "main": "./dist/electron/main/main.js",
   "author": "https://github.com/git102347501/HiDb",
   "description": "hidb",