Delete if it ends with a comma

youngkiu · Sep 18, 2022 · 7891602 · 7891602
1 parent 9ea6324
commit 7891602
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 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.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "schema-to-erd",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "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
@@ -32,7 +32,7 @@ function _removeFunctionKeyword(sqlStr, functionKeyword) {
         }
       }
     }
-    assert(removalEnd, 'Not detect removal region');
+    assert(removalEnd, `Not detect removal region - ${sqlStr}`);
     removalSqlStr = removalSqlStr.slice(0, removalStart) + removalSqlStr.slice(removalEnd);
   }
   return removalSqlStr;
@@ -83,8 +83,7 @@ function _splitDdl(sqlStr) {
     }
     const end = restSqlStr.indexOf(';', start) + 1;
     const ddlStr = restSqlStr.substring(start, end);
-    // console.log(ddlStr.replace(/(\r\n|\n|\r)/g, '').replace(/\s+/g, ' '));
-    ddls.push(_removeUnparsableToken(ddlStr));
+    ddls.push(_removeUnparsableToken(ddlStr).replace(/,[\n\r\s]+\)/gm, '\n)'));
     offset += end;
   }
   return ddls;

diff --git a/src/unparsable_token.json b/src/unparsable_token.json
@@ -1,5 +1,5 @@
 {
   "inter-token": ["BINARY", "national", "STORED"],
-  "match-token": ["VIRTUAL", "type = innodb", "default 0000-00-00 00:00:00", "default 0000-00-00"],
+  "match-token": ["VIRTUAL", "type = innodb", "default 0000-00-00 00:00:00", "default 0000-00-00", "CONSTRANT check_active"],
   "function": ["GENERATED", "CHECK", "PARTITION BY LIST (transaction_type)"]
 }
diff --git a/test/schema_to_erd.spec.js b/test/schema_to_erd.spec.js
@@ -34,13 +34,6 @@ const fileList = await getSqlFiles('schema_samples/**/*.sql');
 console.log(fileList);
 
 describe('samples',  () => {
-  it('function.sql', async () => {
-    const pumlFilePath = await schemaToErd('./schema_samples/function.sql');
-    const { dir, base } = path.parse(pumlFilePath);
-    const pathParts = dir.split(path.sep);
-    const expectedFilePath = path.join('./puml_examples', ...pathParts.slice(1), base);
-    assert.ok(await compareFiles(pumlFilePath, expectedFilePath));
-  });
   fileList.map((filePath) => {
     it(path.parse(filePath).base, async () => {
       const pumlFilePath = await schemaToErd(filePath);