Skip to content

fix: suppress redundant UNIQUE on primary key fields in SQL exports #998

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

Open
20syldev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: suppress redundant UNIQUE on primary key fields in SQL exports #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/utils/exportSQL/generic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export function jsonToMySQL(obj) {
field.name
}\` ${getTypeString(field, obj.database)}${field.notNull ? " NOT NULL" : ""}${
field.increment ? " AUTO_INCREMENT" : ""
}${field.unique ? " UNIQUE" : ""}${
}${field.unique && !field.primary ? " UNIQUE" : ""}${
field.default !== ""
? ` DEFAULT ${parseDefault(field, obj.database)}`
: ""
Expand Down Expand Up @@ -301,7 +301,7 @@ export function jsonToPostgreSQL(obj) {
field.name
}" ${getTypeString(field, obj.database, DB.POSTGRES)}${
field.notNull ? " NOT NULL" : ""
}${field.unique ? " UNIQUE" : ""}${
}${field.unique && !field.primary ? " UNIQUE" : ""}${
field.default !== "" ? ` DEFAULT ${parseDefault(field)}` : ""
}${
field.check === "" ||
Expand Down Expand Up @@ -397,7 +397,7 @@ export function jsonToSQLite(obj) {
`${field.comment === "" ? "" : `\t-- ${field.comment}\n`}\t"${
field.name
}" ${getSQLiteType(field)}${field.notNull ? " NOT NULL" : ""}${
field.unique ? " UNIQUE" : ""
field.unique && !field.primary ? " UNIQUE" : ""
}${field.default !== "" ? ` DEFAULT ${parseDefault(field, obj.database)}` : ""}${
field.check === "" ||
!dbToTypes[obj.database][field.type].hasCheck
Expand Down Expand Up @@ -437,7 +437,7 @@ export function jsonToMariaDB(obj) {
field.name
}\` ${getTypeString(field, obj.database, DB.MYSQL)}${field.notNull ? " NOT NULL" : ""}${
field.increment ? " AUTO_INCREMENT" : ""
}${field.unique ? " UNIQUE" : ""}${
}${field.unique && !field.primary ? " UNIQUE" : ""}${
field.default !== ""
? ` DEFAULT ${parseDefault(field, obj.database)}`
: ""
Expand Down Expand Up @@ -514,7 +514,7 @@ export function jsonToSQLServer(obj) {
}] ${getTypeString(field, obj.database, DB.MSSQL)}${
field.notNull ? " NOT NULL" : ""
}${field.increment ? " IDENTITY" : ""}${
field.unique ? " UNIQUE" : ""
field.unique && !field.primary ? " UNIQUE" : ""
}${
field.default !== ""
? ` DEFAULT ${parseDefault(field, obj.database)}`
Expand Down Expand Up @@ -589,7 +589,7 @@ export function jsonToOracleSQL(obj) {
}" ${getTypeString(field, obj.database, DB.ORACLESQL)}${
field.notNull ? " NOT NULL" : ""
}${field.increment ? " GENERATED ALWAYS AS IDENTITY" : ""}${
field.unique ? " UNIQUE" : ""
field.unique && !field.primary ? " UNIQUE" : ""
}${
field.default !== ""
? ` DEFAULT ${parseDefault(field, obj.database)}`
Expand Down
2 changes: 1 addition & 1 deletion src/utils/exportSQL/mariadb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function toMariaDB(diagram) {
(field) =>
`\t\`${field.name}\` ${parseType(field)}${field.unsigned ? " UNSIGNED" : ""}${field.notNull ? " NOT NULL" : ""}${
field.increment ? " AUTO_INCREMENT" : ""
}${field.unique ? " UNIQUE" : ""}${
}${field.unique && !field.primary ? " UNIQUE" : ""}${
field.default !== ""
? ` DEFAULT ${parseDefault(field, diagram.database)}`
: ""
Expand Down
2 changes: 1 addition & 1 deletion src/utils/exportSQL/mssql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function toMSSQL(diagram) {
return `\t[${field.name}] ${field.type}${field.size && isSized ? `(${field.size})` : ""}${
field.notNull ? " NOT NULL" : ""
}${field.increment ? " IDENTITY" : ""}${
field.unique ? " UNIQUE" : ""
field.unique && !field.primary ? " UNIQUE" : ""
}${
field.default !== ""
? ` DEFAULT ${parseDefault(field, diagram.database)}`
Expand Down
2 changes: 1 addition & 1 deletion src/utils/exportSQL/mysql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export function toMySQL(diagram) {
: ""
}${field.notNull ? " NOT NULL" : ""}${
field.increment ? " AUTO_INCREMENT" : ""
}${field.unique ? " UNIQUE" : ""}${
}${field.unique && !field.primary ? " UNIQUE" : ""}${
field.default !== ""
? ` DEFAULT ${parseDefault(field, diagram.database)}`
: ""
Expand Down
2 changes: 1 addition & 1 deletion src/utils/exportSQL/oraclesql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function toOracleSQL(diagram) {
: ""
}${field.notNull ? " NOT NULL" : ""}${
field.increment ? " GENERATED ALWAYS AS IDENTITY" : ""
}${field.unique ? " UNIQUE" : ""}${
}${field.unique && !field.primary ? " UNIQUE" : ""}${
field.default !== ""
? ` DEFAULT ${parseDefault(field, diagram.database)}`
: ""
Expand Down
2 changes: 1 addition & 1 deletion src/utils/exportSQL/postgres.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export function toPostgres(diagram) {
}" ${field.type}${
field.size ? `(${field.size})` : ""
}${field.isArray ? " ARRAY" : ""}${field.notNull ? " NOT NULL" : ""}${
field.unique ? " UNIQUE" : ""
field.unique && !field.primary ? " UNIQUE" : ""
}${field.increment ? " GENERATED BY DEFAULT AS IDENTITY" : ""}${
field.default?.trim()
? ` DEFAULT ${parseDefault(field, diagram.database)}`
Expand Down
2 changes: 1 addition & 1 deletion src/utils/exportSQL/sqlite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export function toSqlite(diagram) {
`${exportFieldComment(field.comment)}\t"${
field.name
}" ${field.type}${field.notNull ? " NOT NULL" : ""}${
field.unique ? " UNIQUE" : ""
field.unique && !field.primary ? " UNIQUE" : ""
}${field.default !== "" ? ` DEFAULT ${parseDefault(field, diagram.database)}` : ""}${
field.check === "" ||
!dbToTypes[diagram.database][field.type].hasCheck
Expand Down
Loading