Skip to content

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

Use custom types when importing from postgresql (#261)

Christofera358b56d7e42
diff --git a/src/utils/importSQL/postgres.js b/src/utils/importSQL/postgres.js
index 7ac90526..4f01e6af 100644
--- a/src/utils/importSQL/postgres.js
+++ b/src/utils/importSQL/postgres.js
@@ -38,11 +38,19 @@ export function fromPostgres(ast, diagramDb = DB.GENERIC) {
if (d.resource === "column") {
field.name = d.column.column.expr.value;
- let type = d.definition.dataType;
- if (!dbToTypes[diagramDb][type]) {
+ let type = types.find((t) =>
+ new RegExp(`^(${t.name}|"${t.name}")$`).test(
+ d.definition.dataType,
+ ),
+ )?.name;
+ type ??= enums.find((t) =>
+ new RegExp(`^(${t.name}|"${t.name}")$`).test(
+ d.definition.dataType,
+ ),
+ )?.name;
+ if (!type && !dbToTypes[diagramDb][type])
type = affinity[diagramDb][type];
- }
- field.type = type;
+ field.type = type || d.definition.dataType;
if (d.definition.expr && d.definition.expr.type === "expr_list") {
field.values = d.definition.expr.value.map((v) => v.value);