Further improvements in sql COMMNET

youngkiu · Sep 24, 2022 · 4e4a04c · 4e4a04c
1 parent 06a5d0a
commit 4e4a04c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/dist/main.cjs b/dist/main.cjs
diff --git a/dist/main.mjs b/dist/main.mjs
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "schema-to-erd",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "description": "Generate ERD UML file from Schema DDL file",
   "type": "module",
   "main": "dist/main.cjs",

diff --git a/src/parse_ddl.js b/src/parse_ddl.js
@@ -81,8 +81,11 @@ function _splitDdl(sqlStr) {
     if (start === -1) {
       break;
     }
-    const end = restSqlStr.indexOf(';', start) + 1;
-    const ddlStr = restSqlStr.substring(start, end);
+    const end = restSqlStr.indexOf(';', start);
+    if (end === -1) {
+      throw `Not found semicolon(;). Error - ${restSqlStr}`;
+    }
+    const ddlStr = restSqlStr.substring(start, end + 1);
     ddls.push(_removeUnparsableToken(ddlStr).replace(/,[\n\r\s]+\)/gm, '\n)'));
     offset += end;
   }
@@ -101,9 +104,14 @@ function _extractTableObj(jsonSchemaDocuments) {
   };
 }
 
+const _removeSqlComments = (sqlStr) =>
+  sqlStr
+    .replace(/alter\s+table\s+(.*)\s+comment\s+['"](.*?)['"]/gi, '') // https://stackoverflow.com/a/6441056
+    .replace(/COMMENT\s+['"](.*?)['"]/gi, '') // https://stackoverflow.com/a/171483
+    .replace(/\/\*.*?\*\/|--.*?\n/gs, ''); // https://stackoverflow.com/a/21018155
+
 export default (sqlStr) =>
-  // https://stackoverflow.com/a/21018155
-  _splitDdl(sqlStr.replace(/\/\*.*?\*\/|--.*?\n/gs, '')).reduce(
+  _splitDdl(_removeSqlComments(sqlStr)).reduce(
     (acc, sql) => {
       try {
         const options = { useRef: true };
@@ -115,7 +123,7 @@ export default (sqlStr) =>
         const { tableName, columnNames, primaryKeys } = _extractTableObj(jsonSchemaDocuments[0]);
         return { ...acc, [tableName]: { columnNames, primaryKeys } };
       } catch (err) {
-        console.error(`Can not parse "${sql}"`, err);
+        console.error(`Can not parse "${sql}"`);
         return acc;
       }
     },