Address issues (#31)

* Update kuzu to 0.0.11

* Address #20

package.json

@@ -21,7 +21,7 @@
     "bootstrap": "^5.3.1",
     "core-js": "^3.8.3",
     "express": "^4.18.2",
-    "kuzu": "0.0.9",
+    "kuzu": "0.0.11",
     "moment": "^2.29.4",
     "monaco-editor": "^0.41.0",
     "monaco-themes": "^0.4.4",

src/components/MainLayout.vue

@@ -102,11 +102,6 @@ export default {
     async getSchema() {
       const response = await Axios.get("/api/schema");
       const schema = response.data;
-      schema.relTables.forEach((table) => {
-        table.src = table.properties.src;
-        table.dst = table.properties.dst;
-        table.properties = table.properties.props;
-      });
       this.schema = schema;
     },
     async reloadSchema(rerender) {

src/server/Schema.js

@@ -2,30 +2,12 @@ const database = require("./utils/database");
 const express = require("express");
 const router = express.Router();
 
-router.get("/", async (req, res) => {
-  const conn = database.getConnection();
+router.get("/", async (_, res) => {
   try {
-    const nodeTableNames = await conn.getNodeTableNames();
-    const relTableNames = await conn.getRelTableNames();
-    const nodeTableSchemas = await Promise.all(
-      nodeTableNames.map((table) => conn.getNodePropertyNames(table))
-    );
-    const nodeTables = nodeTableNames.map((table, i) => ({
-      name: table,
-      properties: nodeTableSchemas[i],
-    }));
-    const relTableSchemas = await Promise.all(
-      relTableNames.map((table) => conn.getRelPropertyNames(table))
-    );
-    const relTables = relTableNames.map((table, i) => ({
-      name: table,
-      properties: relTableSchemas[i],
-    }));
-    res.send({ nodeTables, relTables });
+    const schema = await database.getSchema();
+    res.send(schema);
   } catch (err) {
     return res.status(400).send({ error: err.message });
-  } finally {
-    database.releaseConnection(conn);
   }
 });
 

src/server/utils/database.js

@@ -1,5 +1,10 @@
 const path = require("path");
 const process = require("process");
+const TABLE_TYPES = {
+  NODE: "NODE",
+  REL: "REL",
+};
+
 let kuzu;
 if (process.env.NODE_ENV !== "production") {
   const kuzuPath = path.join(
@@ -76,6 +81,50 @@ class Database {
     }
     return false;
   }
+
+  async getSchema() {
+    const conn = this.getConnection();
+    try {
+      const tables = await conn
+        .query("CALL show_tables() RETURN *;")
+        .then((res) => res.getAll());
+      const nodeTables = [];
+      const relTables = [];
+      for (const table of tables) {
+        const properties = (
+          await conn
+            .query(`CALL TABLE_INFO('${table.name}') RETURN *;`)
+            .then((res) => res.getAll())
+        ).map((property) => ({
+          name: property.name,
+          type: property.type,
+          isPrimaryKey: property["primary key"],
+        }));
+        if (table.type === TABLE_TYPES.NODE) {
+          delete table["type"];
+          table.properties = properties;
+          nodeTables.push(table);
+        } else if (table.type === TABLE_TYPES.REL) {
+          delete table["type"];
+          properties.forEach((property) => {
+            delete property.isPrimaryKey;
+          });
+          table.properties = properties;
+          const connectivity = await conn
+            .query(`CALL SHOW_CONNECTION('${table.name}') RETURN *;`)
+            .then((res) => res.getAll());
+          const src = connectivity[0]["source table name"];
+          const dst = connectivity[0]["destination table name"];
+          table.src = src;
+          table.dst = dst;
+          relTables.push(table);
+        }
+      }
+      return { nodeTables, relTables };
+    } finally {
+      this.releaseConnection(conn);
+    }
+  }
 }
 
 module.exports = new Database();