Merge pull request #100 from open-source-labs/roadmap

bugfix: resolved issue preventing mysql from showing up without postgres
open-source-labs · Jul 10, 2023 · 35a6790 · 35a6790
2 parents e9bb765 + 305ad36
commit 35a6790
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/backend/ertable-functions.ts b/backend/ertable-functions.ts
@@ -4,7 +4,6 @@ import {
   AlterTablesObjType,
   AlterColumnsObjType,
   AddConstraintObjType,
-  AddColumnsObjType,
 } from '../frontend/types';
 
 import { BackendObjType, DBType } from './BE_types';

diff --git a/backend/models.ts b/backend/models.ts
@@ -440,7 +440,7 @@ const DBFunctions: DBFunctions = {
           pool
             .query(query)
             .then((databases) => {
-              for (let i = 0; i < databases.rows.length; i++) {
+              for (let i = 0; i < databases.rows.length; i += 1) {
                 const data = databases.rows[i];
                 const { db_name } = data;
 
@@ -489,17 +489,11 @@ const DBFunctions: DBFunctions = {
           pool
             .query(query)
             .then((databases) => {
-              for (let i = 0; i < databases[0].length; i++) {
+              for (let i = 0; i < databases[0].length; i += 1) {
                 const data = databases[0][i];
-                const { db_name } = data;
-                if (
-                  db_name !== 'postgres' &&
-                  db_name !== 'template0' &&
-                  db_name !== 'template1'
-                ) {
-                  data.db_type = dbType;
-                  dbList.push(data);
-                }
+                data.db_type = dbType;
+                data.db_size = data.db_size ? `${data.db_size}KB` : '0KB';
+                dbList.push(data);
               }
 
               logger("MySQL 'getDBNames' resolved.", LogType.SUCCESS);
@@ -519,7 +513,7 @@ const DBFunctions: DBFunctions = {
         const stats = fs.statSync(path)
         const fileSizeInKB = stats.size / 1024;
         // Convert the file size to megabytes (optional)
-        const data = { db_name: filename, db_size: `${fileSizeInKB}kB`, db_type: DBType.SQLite }
+        const data = { db_name: filename, db_size: `${fileSizeInKB}KB`, db_type: DBType.SQLite }
         dbList.push(data);
         resolve(dbList);
       }

diff --git a/frontend/components/App.tsx b/frontend/components/App.tsx
@@ -97,8 +97,8 @@ const App = () => {
       if (isDbLists(dbLists)) {
         setDBInfo(dbLists.databaseList);
         setTables(dbLists.tableList);
-        setPGStatus(dbLists.databaseConnected[0]);
-        setMYSQLStatus(dbLists.databaseConnected[1]);
+        setPGStatus(dbLists.databaseConnected.PG);
+        setMYSQLStatus(dbLists.databaseConnected.MySQL);
 
         setSelectedTable(selectedTable || dbTables[0]);
       }
@@ -149,7 +149,7 @@ const App = () => {
     case 'newSchemaView':
       shownView = 'newSchemaView';
       break;
-    case 'threeDView':                
+    case 'threeDView':
       shownView = 'threeDView';
       break;
     case 'quickStartView':
@@ -220,10 +220,10 @@ const App = () => {
             />
             <QuickStartView show={shownView === 'quickStartView'} />
 
-            <ThreeDView 
+            <ThreeDView
               show={shownView === 'threeDView'}
               selectedDb={selectedDb}
-              dbTables={dbTables} 
+              dbTables={dbTables}
               dbType={curDBType}
             />
 

diff --git a/frontend/types.ts b/frontend/types.ts
@@ -163,7 +163,14 @@ export interface TableInfo {
 }
 
 export interface DbLists {
-  databaseConnected: boolean[];
+  databaseConnected: {
+    PG: boolean,
+    MySQL: boolean,
+    RDSPG: boolean,
+    RDSMySQL: boolean,
+    SQLite: boolean,
+    directPGURI: boolean,
+  };
   databaseList: DatabaseInfo[];
   tableList: TableInfo[];
   dbType: DBType;
@@ -180,8 +187,8 @@ export const isDbLists = (obj: unknown): obj is DbLists => {
       return false;
     if (obj.databaseList[0] && typeof obj.databaseList[0].db_name !== 'string')
       return false;
-    if (obj.databaseList[0] && typeof obj.databaseList[0].db_size !== 'string')
-      return false;
+    // if (obj.databaseList[0] && typeof obj.databaseList[0].db_size !== 'string' )
+    //   return false;
     if (obj.tableList[0] && typeof obj.tableList[0].table_name !== 'string')
       return false;
     if (obj.tableList[0] && typeof obj.tableList[0].table_catalog !== 'string')