Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
fix: add postgres array type support for import and export (#958)
Jonathan Fishner68412f90a7d4
diff --git a/src/lib/data/import-metadata/scripts/postgres-script.ts b/src/lib/data/import-metadata/scripts/postgres-script.tsindex 25df1864..0fbe76a0 100644--- a/src/lib/data/import-metadata/scripts/postgres-script.ts+++ b/src/lib/data/import-metadata/scripts/postgres-script.ts@@ -181,7 +181,13 @@ cols AS ('","table":"', cols.table_name,'","name":"', cols.column_name,'","ordinal_position":', cols.ordinal_position,- ',"type":"', case when LOWER(replace(cols.data_type, '"', '')) = 'user-defined' then pg_type.typname else LOWER(replace(cols.data_type, '"', '')) end,+ ',"type":"', CASE WHEN cols.data_type = 'ARRAY' THEN+ format_type(pg_type.typelem, NULL)+ WHEN LOWER(replace(cols.data_type, '"', '')) = 'user-defined' THEN+ format_type(pg_type.oid, NULL)+ ELSE+ LOWER(replace(cols.data_type, '"', ''))+ END,'","character_maximum_length":"', COALESCE(cols.character_maximum_length::text, 'null'),'","precision":',CASE@@ -194,11 +200,15 @@ cols AS (',"default":"', ${withExtras ? withDefault : withoutDefault},'","collation":"', COALESCE(cols.COLLATION_NAME, ''),'","comment":"', ${withExtras ? withComments : withoutComments},- '","is_identity":', CASE+ '","is_identity":', CASEWHEN cols.is_identity = 'YES' THEN 'true'WHEN cols.column_default IS NOT NULL AND cols.column_default LIKE 'nextval(%' THEN 'true'ELSE 'false'END,+ ',"is_array":', CASE+ WHEN cols.data_type = 'ARRAY' OR pg_type.typelem > 0 THEN 'true'+ ELSE 'false'+ END,'}')), ',') AS cols_metadataFROM information_schema.columns colsLEFT JOIN pg_catalog.pg_class c@@ -211,6 +221,8 @@ cols AS (ON attr.attrelid = c.oid AND attr.attname = cols.column_nameLEFT JOIN pg_catalog.pg_typeON pg_type.oid = attr.atttypid+ LEFT JOIN pg_catalog.pg_type AS elem_type+ ON elem_type.oid = pg_type.typelemWHERE cols.table_schema NOT IN ('information_schema', 'pg_catalog')${databaseEdition === DatabaseEdition.POSTGRESQL_TIMESCALE? timescaleColFilterdiff --git a/src/lib/data/sql-export/export-per-type/postgresql.ts b/src/lib/data/sql-export/export-per-type/postgresql.tsindex dbe1ffc5..daaaedb1 100644--- a/src/lib/data/sql-export/export-per-type/postgresql.ts+++ b/src/lib/data/sql-export/export-per-type/postgresql.ts@@ -286,10 +286,14 @@ export function exportPostgreSQL({}}- // Handle array types (check if the type name ends with '[]')- if (typeName.endsWith('[]')) {- typeWithSize =- typeWithSize.replace('[]', '') + '[]';+ // Handle array types (check if isArray flag or if type name ends with '[]')+ if (field.isArray || typeName.endsWith('[]')) {+ // Remove any existing [] notation+ const baseTypeWithoutArray = typeWithSize.replace(+ /\[\]$/,+ ''+ );+ typeWithSize = baseTypeWithoutArray + '[]';}const notNull = field.nullable ? '' : ' NOT NULL';