Fix import from sql for mssql

drawdb-io · Jan 18, 2025 · f0adcf1 · f0adcf1
1 parent 5476470
commit f0adcf1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "jsonschema": "^1.4.1",
     "jspdf": "^2.5.1",
     "lexical": "^0.12.5",
-    "node-sql-parser": "^5.3.4",
+    "node-sql-parser": "^5.3.6",
     "octokit": "^4.0.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/src/utils/importSQL/mssql.js b/src/utils/importSQL/mssql.js
@@ -199,7 +199,8 @@ export function fromMSSQL(ast, diagramDb = DB.GENERIC) {
       e.expr.forEach((expr) => {
         if (
           expr.action === "add" &&
-          expr.create_definitions.constraint_type.toLowerCase() === "foreign key"
+          expr.create_definitions.constraint_type.toLowerCase() ===
+            "foreign key"
         ) {
           const relationship = {};
           const startTable = e.table[0].table;
@@ -266,16 +267,18 @@ export function fromMSSQL(ast, diagramDb = DB.GENERIC) {
 
   if (ast.go_next) {
     let x = { ...ast };
-    let done = Array.isArray(x.go_next);
+    let done = false;
     while (!done) {
       parseSingleStatement(x.ast);
+      done = Array.isArray(x.go_next) && x.go_next.length === 0;
       x = { ...x.go_next };
-      done = Array.isArray(x.go_next);
     }
   } else if (Array.isArray(ast)) {
     ast.forEach((e) => {
       parseSingleStatement(e);
     });
+  } else if (typeof ast === "object") {
+    parseSingleStatement(ast);
   }
 
   return { tables, relationships };