Skip to content

Free, simple, and intuitive online database diagram editor and SQL generator.

Escape single quotes in ENUM/SET values (#1126)

Ngo Quoc Viet031aef1f1c1d
diff --git a/src/utils/exportSQL/mariadb.js b/src/utils/exportSQL/mariadb.js
index a6e7a62f..2d9929b8 100644
--- a/src/utils/exportSQL/mariadb.js
+++ b/src/utils/exportSQL/mariadb.js
@@ -12,7 +12,7 @@ function parseType(field) {
let res = field.type;
if (field.type === "SET" || field.type === "ENUM") {
- res += `${field.values ? "(" + field.values.map((value) => "'" + value + "'").join(", ") + ")" : ""}`;
+ res += `${field.values ? "(" + field.values.map((value) => "'" + escapeQuotes(String(value)) + "'").join(", ") + ")" : ""}`;
}
if (
diff --git a/src/utils/exportSQL/mysql.js b/src/utils/exportSQL/mysql.js
index 85078ad1..593ce729 100644
--- a/src/utils/exportSQL/mysql.js
+++ b/src/utils/exportSQL/mysql.js
@@ -12,7 +12,7 @@ function parseType(field) {
let res = field.type;
if (field.type === "SET" || field.type === "ENUM") {
- res += `${field.values ? "(" + field.values.map((value) => "'" + value + "'").join(", ") + ")" : ""}`;
+ res += `${field.values ? "(" + field.values.map((value) => "'" + escapeQuotes(String(value)) + "'").join(", ") + ")" : ""}`;
}
if (
diff --git a/src/utils/exportSQL/postgres.js b/src/utils/exportSQL/postgres.js
index a2d7b509..ad1dbfac 100644
--- a/src/utils/exportSQL/postgres.js
+++ b/src/utils/exportSQL/postgres.js
@@ -12,7 +12,7 @@ export function toPostgres(diagram) {
.map(
(e) =>
`CREATE TYPE "${e.name}" AS ENUM (\n${e.values
- .map((v) => `\t'${v}'`)
+ .map((v) => `\t'${escapeQuotes(String(v))}'`)
.join(",\n")}\n);\n`,
)
.join("\n");
diff --git a/src/utils/migrations/diffToSQL.js b/src/utils/migrations/diffToSQL.js
index ec4b3881..7ec242e0 100644
--- a/src/utils/migrations/diffToSQL.js
+++ b/src/utils/migrations/diffToSQL.js
@@ -20,7 +20,7 @@ function parseType(field, db) {
const meta = dbToTypes[db]?.[field.type];
if (field.type === "SET" || field.type === "ENUM") {
res += field.values
- ? `(${field.values.map((v) => `'${v}'`).join(", ")})`
+ ? `(${field.values.map((v) => `'${escapeQuotes(String(v))}'`).join(", ")})`
: "";
} else if (meta?.isSized || meta?.hasPrecision) {
res += field.size ? `(${field.size})` : "";