Merge pull request #729 from Joannall/master

excel handler - drop tmp table before create

Author: Oceania2018

src/Plugins/BotSharp.Plugin.ExcelHandler/Functions/HandleExcelRequestFn.cs

@@ -64,18 +64,13 @@ public async Task<bool> Execute(RoleDialogModel message)
             message.Content = "No excel files found in the conversation";
             return true;
         }
-        if (!DeleteTable())
-        {
-            message.Content = "Failed to clear existing tables. Please manually delete all existing tables";
-        }
-        else
-        {
-            var resultList = GetResponeFromDialogs(dialogs);
-            var states = _serviceProvider.GetRequiredService<IConversationStateService>();
 
-            message.Content = GenerateSqlExecutionSummary(resultList);
-            states.SetState("excel_import_result",message.Content);
-        }
+        var resultList = GetResponeFromDialogs(dialogs);
+        var states = _serviceProvider.GetRequiredService<IConversationStateService>();
+
+        message.Content = GenerateSqlExecutionSummary(resultList);
+        states.SetState("excel_import_result",message.Content);
+        
         return true;
     }
 
@@ -122,28 +117,12 @@ private List<SqlContextOut> GetResponeFromDialogs(List<RoleDialogModel> dialogs)
             var bytes = _fileStorage.GetFileBytes(file.FileStorageUrl);
             var workbook = ConvertToWorkBook(bytes);
 
-
-            //var dbService = CreateDbService(DbServiceType.MySql);
             var currentCommandList = _mySqlService.WriteExcelDataToDB(workbook);
             sqlCommandList.AddRange(currentCommandList);
         }
         return sqlCommandList;
     }
 
-    private bool DeleteTable()
-    {
-        try
-        {
-            //_mySqlService.DeleteTableSqlQuery();
-            return true;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Failed to delete table");
-            return false;
-        }
-    }
-
     private string GenerateSqlExecutionSummary(List<SqlContextOut> messageList)
     {
         var stringBuilder = new StringBuilder();

src/Plugins/BotSharp.Plugin.ExcelHandler/Services/MySqlService.cs

@@ -31,13 +31,6 @@ public bool DeleteTableSqlQuery()
         {
             try
             {
-                /*using var mySqlDbConnection = _mySqlDbHelpers.GetDbConnection();
-                var tableNames = GetAllTableSchema(mySqlDbConnection);
-                if (tableNames.IsNullOrEmpty())
-                {
-                    return true;
-                }*/
-                
                 return true;
             }
             catch (Exception ex)
@@ -232,7 +225,7 @@ private string CreateDBTableSqlString(string tableName, List<string> headerColum
                 _columnTypes?.Insert(0, "INT UNSIGNED AUTO_INCREMENT");
             }*/
 
-            var createTableSql = $"CREATE TABLE if not exists {tableName} ( \n";
+            var createTableSql = $"DROP TABLE IF EXISTS {tableName}; CREATE TABLE if not exists {tableName} ( \n";
             createTableSql += string.Join(", \n", headerColumns.Select((x, i) => $"`{x}` {_columnTypes[i]}"));
             var indexSql = string.Join(", \n", headerColumns.Select(x => $"KEY `idx_{tableName}_{x}` (`{x}`)"));
             createTableSql += $", \n{indexSql}\n);";