From f47c83fece7b5903d03f20bbb35ce9acdaca1e47 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sat, 11 Sep 2021 08:47:22 +0200
Subject: [PATCH] rename column, drop column ctx menu works

---
 .../web/src/appobj/ColumnAppObject.svelte     | 35 ++++++++-----------
 .../src/appobj/DatabaseObjectAppObject.svelte | 24 ++++++-------
 .../web/src/utility/alterDatabaseTools.ts     |  4 ++-
 3 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/packages/web/src/appobj/ColumnAppObject.svelte b/packages/web/src/appobj/ColumnAppObject.svelte
index 2d2018ea1..f632c5189 100644
--- a/packages/web/src/appobj/ColumnAppObject.svelte
+++ b/packages/web/src/appobj/ColumnAppObject.svelte
@@ -3,36 +3,29 @@
 </script>
 
 <script lang="ts">
+  import _ from 'lodash';
+
   import { getColumnIcon } from '../elements/ColumnLabel.svelte';
-  import { renameDatabaseObjectDialog } from '../utility/alterDatabaseTools';
+  import { renameDatabaseObjectDialog, alterDatabaseDialog } from '../utility/alterDatabaseTools';
 
   import AppObjectCore from './AppObjectCore.svelte';
 
   export let data;
 
   function handleRenameColumn() {
-    renameDatabaseObjectDialog(data.conid, data.database, data.columnName, (db, newName) => ({
-      ...db,
-      tables: db.tables.map(tbl =>
-        tbl.schemaName == data.schemaName && tbl.pureName == data.pureName
-          ? {
-              ...tbl,
-              columns: tbl.columns.map(
-                col =>
-                  (col.columnName = data.columnName
-                    ? {
-                        ...col,
-                        columnName: newName,
-                      }
-                    : col)
-              ),
-            }
-          : tbl
-      ),
-    }));
+    renameDatabaseObjectDialog(data.conid, data.database, data.columnName, (db, newName) => {
+      const tbl = db.tables.find(x => x.schemaName == data.schemaName && x.pureName == data.pureName);
+      const col = tbl.columns.find(x => x.columnName == data.columnName);
+      col.columnName = newName;
+    });
   }
 
-  function handleDropColumn() {}
+  function handleDropColumn() {
+    alterDatabaseDialog(data.conid, data.database, db => {
+      const tbl = db.tables.find(x => x.schemaName == data.schemaName && x.pureName == data.pureName);
+      _.remove(tbl.columns as any[], x => x.columnName == data.columnName);
+    });
+  }
 
   function createMenu() {
     return [
diff --git a/packages/web/src/appobj/DatabaseObjectAppObject.svelte b/packages/web/src/appobj/DatabaseObjectAppObject.svelte
index d8d0281f8..587f17f35 100644
--- a/packages/web/src/appobj/DatabaseObjectAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseObjectAppObject.svelte
@@ -513,20 +513,20 @@
               });
             } else if (menu.isDrop) {
               const { conid, database } = data;
-              alterDatabaseDialog(conid, database, db => ({
-                ...db,
-                [data.objectTypeField]: (db[data.objectTypeField] || []).filter(
-                  x => x.schemaName != data.schemaName || x.pureName != data.pureName
-                ),
-              }));
+              alterDatabaseDialog(conid, database, db => {
+                _.remove(
+                  db[data.objectTypeField] as any[],
+                  x => x.schemaName == data.schemaName && x.pureName == data.pureName
+                );
+              });
             } else if (menu.isRename) {
               const { conid, database } = data;
-              renameDatabaseObjectDialog(conid, database, data.pureName, (db, newName) => ({
-                ...db,
-                [data.objectTypeField]: (db[data.objectTypeField] || []).map(x =>
-                  x.schemaName == data.schemaName && x.pureName == data.pureName ? { ...x, pureName: newName } : x
-                ),
-              }));
+              renameDatabaseObjectDialog(conid, database, data.pureName, (db, newName) => {
+                const obj = db[data.objectTypeField].find(
+                  x => x.schemaName == data.schemaName && x.pureName == data.pureName
+                );
+                obj.pureName = newName;
+              });
             } else {
               openDatabaseObjectDetail(menu.tab, menu.scriptTemplate, data, menu.forceNewTab, menu.initialData);
             }
diff --git a/packages/web/src/utility/alterDatabaseTools.ts b/packages/web/src/utility/alterDatabaseTools.ts
index 3d1beb977..7346d0125 100644
--- a/packages/web/src/utility/alterDatabaseTools.ts
+++ b/packages/web/src/utility/alterDatabaseTools.ts
@@ -1,3 +1,4 @@
+import _ from 'lodash'
 import { findEngineDriver, generateDbPairingId, getAlterDatabaseScript } from 'dbgate-tools';
 import InputTextModal from '../modals/InputTextModal.svelte';
 import { showModal } from '../modals/modalTools';
@@ -11,7 +12,8 @@ export async function alterDatabaseDialog(conid, database, updateFunc) {
   const driver = findEngineDriver(conn, getExtensions());
 
   const db = generateDbPairingId(await getDatabaseInfo({ conid, database }));
-  const dbUpdated = updateFunc(db);
+  const dbUpdated = _.cloneDeep(db);
+  updateFunc(dbUpdated);
 
   const sql = getAlterDatabaseScript(db, dbUpdated, {}, db, driver);