Free, simple, and intuitive online database diagram editor and SQL generator.
JavaScript databasedatabase-designdatabase-diagramdatabase-schemadbmldiagram-editoreditorer-diagramerderdiagramindexeddbmariadbmcporacle-databaseoracle-dbpostgresqlschema-designsqlsql-serversqlite
Fix quotes on columns in checks
1ilit9e2bb48fb87f
diff --git a/src/utils/importSQL/mariadb.js b/src/utils/importSQL/mariadb.jsindex e458d847..eb430f3b 100644--- a/src/utils/importSQL/mariadb.js+++ b/src/utils/importSQL/mariadb.js@@ -92,7 +92,7 @@ export function fromMariaDB(ast, diagramDb = DB.GENERIC) {}field.check = "";if (d.check) {- field.check = buildSQLFromAST(d.check.definition[0]);+ field.check = buildSQLFromAST(d.check.definition[0], DB.MARIADB);}table.fields.push(field);diff --git a/src/utils/importSQL/mssql.js b/src/utils/importSQL/mssql.jsindex 4d8efefa..4b636852 100644--- a/src/utils/importSQL/mssql.js+++ b/src/utils/importSQL/mssql.js@@ -104,7 +104,7 @@ export function fromMSSQL(ast, diagramDb = DB.GENERIC) {}field.check = "";if (d.check) {- field.check = buildSQLFromAST(d.check.definition[0]);+ field.check = buildSQLFromAST(d.check.definition[0], DB.MSSQL);}table.fields.push(field);diff --git a/src/utils/importSQL/mysql.js b/src/utils/importSQL/mysql.jsindex a6b674b5..caa06d65 100644--- a/src/utils/importSQL/mysql.js+++ b/src/utils/importSQL/mysql.js@@ -92,7 +92,7 @@ export function fromMySQL(ast, diagramDb = DB.GENERIC) {}field.check = "";if (d.check) {- field.check = buildSQLFromAST(d.check.definition[0]);+ field.check = buildSQLFromAST(d.check.definition[0], DB.MYSQL);}table.fields.push(field);diff --git a/src/utils/importSQL/postgres.js b/src/utils/importSQL/postgres.jsindex 84b0f803..be183d84 100644--- a/src/utils/importSQL/postgres.js+++ b/src/utils/importSQL/postgres.js@@ -92,7 +92,7 @@ export function fromPostgres(ast, diagramDb = DB.GENERIC) {}field.check = "";if (d.check) {- field.check = buildSQLFromAST(d.check.definition[0]);+ field.check = buildSQLFromAST(d.check.definition[0], DB.POSTGRES);}table.fields.push(field);diff --git a/src/utils/importSQL/shared.js b/src/utils/importSQL/shared.jsindex 0c273107..cab0cbcf 100644--- a/src/utils/importSQL/shared.js+++ b/src/utils/importSQL/shared.js@@ -1,7 +1,24 @@-export function buildSQLFromAST(ast) {+import { DB } from "../../data/constants";++function quoteColumn(str, db) {+ switch (db) {+ case DB.MYSQL:+ return `\`${str}\``;+ case DB.SQLITE:+ return `"${str}"`;+ case DB.POSTGRES:+ return `"${str}"`;+ case DB.MSSQL:+ return `[${str}]`;+ case DB.MARIADB:+ return `\`${str}\``;+ }+}++export function buildSQLFromAST(ast, db = DB.MYSQL) {if (ast.type === "binary_expr") {- const leftSQL = buildSQLFromAST(ast.left);- const rightSQL = buildSQLFromAST(ast.right);+ const leftSQL = buildSQLFromAST(ast.left, db);+ const rightSQL = buildSQLFromAST(ast.right, db);return `${leftSQL} ${ast.operator} ${rightSQL}`;}@@ -26,7 +43,7 @@ export function buildSQLFromAST(ast) {}return expr;} else if (ast.type === "column_ref") {- return "`" + ast.column + "`";+ return quoteColumn(ast.column, db);} else if (ast.type === "expr_list") {return ast.value.map((v) => v.value).join(" AND ");} else {diff --git a/src/utils/importSQL/sqlite.js b/src/utils/importSQL/sqlite.jsindex 7a1c9c3a..28f359d8 100644--- a/src/utils/importSQL/sqlite.js+++ b/src/utils/importSQL/sqlite.js@@ -110,7 +110,7 @@ export function fromSQLite(ast, diagramDb = DB.GENERIC) {}field.check = "";if (d.check) {- field.check = buildSQLFromAST(d.check.definition[0]);+ field.check = buildSQLFromAST(d.check.definition[0], DB.SQLITE);}table.fields.push(field);