Skip to content

Fix syntax errors in types for pg export #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1ilit merged 2 commits into from
Mar 18, 2025
Merged

Fix syntax errors in types for pg export #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb22a0f
Fix syntax errors in types for pg export
1ilit Mar 18, 2025
55f12e2
Fix syntax errors in types for generic pg export
1ilit Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/utils/exportSQL/generic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,11 @@ export function jsonToPostgreSQL(obj) {
} else {
return `CREATE TYPE ${type.name} AS (\n${type.fields
.map((f) => `\t${f.name} ${getTypeString(f, obj.database, "postgres")}`)
.join(
"\n",
)}\n);\n${type.comment != "" ? `\nCOMMENT ON TYPE ${type.name} IS '${type.comment}';\n` : ""}`;
.join(",\n")}\n);\n${
type.comment && type.comment.trim() != ""
? `\nCOMMENT ON TYPE ${type.name} IS '${type.comment}';\n`
: ""
}`;
}
})}\n${obj.tables
.map(
Expand Down
18 changes: 10 additions & 8 deletions src/utils/exportSQL/postgres.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ export function toPostgres(diagram) {
const typeStatements = diagram.types
.map(
(type) =>
`\nCREATE TYPE ${type.name} AS (\n${type.fields
`CREATE TYPE ${type.name} AS (\n${type.fields
.map((f) => `\t${f.name} ${f.type}`)
.join("\n")}\n);\n\n${
type.comment.trim() !== ""
.join(",\n")}\n);\n\n${
type.comment && type.comment.trim() !== ""
? `\nCOMMENT ON TYPE "${type.name}" IS '${type.comment}';\n\n`
: ""
}`,
)
.join("\n");

return `${enumStatements}${typeStatements}${diagram.tables
return `${enumStatements}${enumStatements.trim() !== "" ? `\n${typeStatements}` : typeStatements}${diagram.tables
.map(
(table) =>
`CREATE TABLE "${table.name}" (\n${table.fields
Expand All @@ -32,7 +32,9 @@ export function toPostgres(diagram) {
`${exportFieldComment(field.comment)}\t"${
field.name
}" ${field.type}${
field.size !== undefined && field.size !== "" ? "(" + field.size + ")" : ""
field.size !== undefined && field.size !== ""
? "(" + field.size + ")"
: ""
}${field.isArray ? " ARRAY" : ""}${field.notNull ? " NOT NULL" : ""}${field.unique ? " UNIQUE" : ""}${
field.increment ? " GENERATED BY DEFAULT AS IDENTITY" : ""
}${
Expand All @@ -53,7 +55,7 @@ export function toPostgres(diagram) {
.map((f) => `"${f.name}"`)
.join(", ")})`
: ""
}\n);\n${
}\n);${
table.comment.trim() !== ""
? `\nCOMMENT ON TABLE "${table.name}" IS '${table.comment}';\n`
: ""
Expand All @@ -74,10 +76,10 @@ export function toPostgres(diagram) {
)
.join("\n")}\n`,
)
.join("\n")}\n${diagram.references
.join("\n")}${diagram.references
.map(
(r) =>
`ALTER TABLE "${diagram.tables[r.startTableId].name}"\nADD FOREIGN KEY("${
`\nALTER TABLE "${diagram.tables[r.startTableId].name}"\nADD FOREIGN KEY("${
diagram.tables[r.startTableId].fields[r.startFieldId].name
}") REFERENCES "${diagram.tables[r.endTableId].name}"("${
diagram.tables[r.endTableId].fields[r.endFieldId].name
Expand Down