Simplify function removal code

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

Hide file tree

Showing 7 changed files with 36 additions and 34 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.6",
+  "version": "1.2.7",
   "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
@@ -26,14 +26,11 @@ function _removeFunctionKeyword(sqlStr, functionKeyword) {
         parenthesesDepth += 1;
       } else if (c === ')') {
         parenthesesDepth -= 1;
-        assert(parenthesesDepth >= 0, `parenthesesDepth(${parenthesesDepth}) is minus value`);
         if (parenthesesDepth === 0) {
           removalEnd = i+1;
+          break;
         }
       }
-      if (c === '\n' && removalEnd && parenthesesDepth === 0) {
-        break;
-      }
     }
     assert(removalEnd, 'Not detect removal region');
     removalSqlStr = removalSqlStr.slice(0, removalStart) + removalSqlStr.slice(removalEnd);

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"],
-  "function": ["GENERATED", "CHECK", "PARTITION"]
+  "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,6 +34,13 @@ 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);