Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions src/utils/exportSQL/generic.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,10 @@ export function jsonToMySQL(obj) {
}${
field.check === "" ||
!dbToTypes[obj.database][field.type].hasCheck
? !Object.keys(defaultTypes).includes(field.type)
? !Object.keys(defaultTypes).includes(field.type) &&
obj.types.find(
(t) => t.name === field.type.toLowerCase(),
)
? ` CHECK(\n\t\tJSON_SCHEMA_VALID("${generateSchema(
obj.types.find(
(t) => t.name === field.type.toLowerCase(),
Expand Down Expand Up @@ -458,7 +461,10 @@ export function jsonToMariaDB(obj) {
}${
field.check === "" ||
!dbToTypes[obj.database][field.type].hasCheck
? !Object.keys(defaultTypes).includes(field.type)
? !Object.keys(defaultTypes).includes(field.type) &&
obj.types.find(
(t) => t.name === field.type.toLowerCase(),
)
? ` CHECK(\n\t\tJSON_SCHEMA_VALID('${generateSchema(
obj.types.find(
(t) => t.name === field.type.toLowerCase(),
Expand Down
7 changes: 6 additions & 1 deletion src/utils/importFrom/dbml.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ export function fromDBML(src) {

field.id = nanoid();
field.name = column.name;
field.type = column.type.type_name.toUpperCase();
// type_name includes parentheses (e.g. "varchar(50)"), args is the parameter string (e.g. "50").
// Separate them into raw type name and size for drawdb's internal format.
const rawTypeName = column.type.type_name.toUpperCase();
const parenIdx = rawTypeName.indexOf("(");
field.type = parenIdx !== -1 ? rawTypeName.substring(0, parenIdx) : rawTypeName;
field.size = column.type.args ?? "";
field.default = column.dbdefault?.value ?? "";
field.check = "";
field.primary = !!column.pk;
Expand Down
Loading