Free, simple, and intuitive online database diagram editor and SQL generator.
JavaScript databasedatabase-designdatabase-diagramdatabase-schemadbmldiagram-editoreditorer-diagramerderdiagramindexeddbmariadbmcporacle-databaseoracle-dbpostgresqlschema-designsqlsql-serversqlite
Handle default function parsing
1ilit1beed53cb640
diff --git a/package-lock.json b/package-lock.jsonindex 685fee28..9f66e860 100644--- a/package-lock.json+++ b/package-lock.json@@ -25,7 +25,7 @@"jsonschema": "^1.4.1","jspdf": "^2.5.1","lexical": "^0.12.5",- "node-sql-parser": "^4.17.0",+ "node-sql-parser": "^5.0.0","react": "^18.2.0","react-dom": "^18.2.0","react-hotkeys-hook": "^4.4.1",@@ -1715,6 +1715,11 @@"@babel/types": "^7.20.7"}},+ "node_modules/@types/pegjs": {+ "version": "0.10.6",+ "resolved": "https://registry.npmjs.org/@types/pegjs/-/pegjs-0.10.6.tgz",+ "integrity": "sha512-eLYXDbZWXh2uxf+w8sXS8d6KSoXTswfps6fvCUuVAGN8eRpfe7h9eSRydxiSJvo9Bf+GzifsDOr9TMQlmJdmkw=="+ },"node_modules/@types/prop-types": {"version": "15.7.11","resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",@@ -4368,10 +4373,11 @@"dev": true},"node_modules/node-sql-parser": {- "version": "4.17.0",- "resolved": "https://registry.npmjs.org/node-sql-parser/-/node-sql-parser-4.17.0.tgz",- "integrity": "sha512-3IhovpmUBpcETnoKK/KBdkz2mz53kVG5E1dnqz1QuYvtzdxYZW5xaGGEvW9u6Yyy2ivwR3eUZrn9inmEVef02w==",+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/node-sql-parser/-/node-sql-parser-5.0.0.tgz",+ "integrity": "sha512-hkNU1gIT8BNe8vmcsU7uYie0gzow/6AIj5KnGRBJQSZlgEu1NNuLVS11it5gAEdpmvJHelc34BwR439Iela+zQ==","dependencies": {+ "@types/pegjs": "^0.10.0","big-integer": "^1.6.48"},"engines": {diff --git a/package.json b/package.jsonindex 875cdbc9..fa199173 100644--- a/package.json+++ b/package.json@@ -27,7 +27,7 @@"jsonschema": "^1.4.1","jspdf": "^2.5.1","lexical": "^0.12.5",- "node-sql-parser": "^4.17.0",+ "node-sql-parser": "^5.0.0","react": "^18.2.0","react-dom": "^18.2.0","react-hotkeys-hook": "^4.4.1",diff --git a/src/utils/astToDiagram.js b/src/utils/astToDiagram.jsindex 27422191..660e3bf5 100644--- a/src/utils/astToDiagram.js+++ b/src/utils/astToDiagram.js@@ -31,7 +31,30 @@ export function astToDiagram(ast) {field.primary = false;if (d.primary_key) field.primary = true;field.default = "";- if (d.default_val) field.default = d.default_val.value.value.toString();+ if (d.default_val) {+ let defaultValue = "";+ if (d.default_val.value.type === "function") {+ defaultValue = d.default_val.value.name;+ if (d.default_val.value.args) {+ defaultValue +=+ "(" ++ d.default_val.value.args.value+ .map((v) => {+ if (+ v.type === "single_quote_string" ||+ v.type === "double_quote_string"+ )+ return "'" + v.value + "'";+ return v.value;+ })+ .join(", ") ++ ")";+ }+ } else {+ defaultValue = d.default_val.value.value.toString();+ }+ field.default = defaultValue;+ }if (d.definition["length"]) field.size = d.definition["length"];field.check = "";if (d.check) {@@ -135,7 +158,7 @@ export function astToDiagram(ast) {deleteConstraint[0].toUpperCase() +deleteConstraint.substring(1);}- }+ },);let startTableId = -1;