@dbml/connector 11.0.0-alpha.2 → 11.0.0-alpha.4

package/__tests__/connector.test.ts

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import { Client } from 'pg';
 import { scanDirNames } from './testHelpers';
 import { connector } from '../src/index';
 
@@ -44,4 +45,76 @@ describe('@dbml/connector', () => {
   test.each(scanDirNames(__dirname, 'connectors'))('connectors/%s', async (dirName) => {
     await runTest(path.join(__dirname, 'connectors', dirName));
   }, 10000);
+
+  test('postgres preserves composite foreign key column order', async () => {
+    const testDir = path.join(__dirname, 'connectors', 'postgres');
+    const { connection } = JSON.parse(fs.readFileSync(path.join(testDir, 'connection.json'), 'utf-8'));
+    const schema = `dbml_fk_order_${Math.random().toString(16).slice(2)}`;
+    const client = new Client({ connectionString: connection });
+
+    await client.connect();
+    try {
+      await client.query(`CREATE SCHEMA "${schema}"`);
+      await client.query(`
+        CREATE TABLE "${schema}".parent (
+          zeta integer NOT NULL,
+          alpha integer NOT NULL,
+          PRIMARY KEY (zeta, alpha)
+        );
+        CREATE TABLE "${schema}".child (
+          id integer PRIMARY KEY,
+          a_zeta integer,
+          z_alpha integer,
+          CONSTRAINT child_parent_fk FOREIGN KEY (a_zeta, z_alpha)
+            REFERENCES "${schema}".parent (zeta, alpha)
+        );
+      `);
+
+      const schemaJson = await connector.fetchSchemaJson(`${connection}?schemas=${schema}`, 'postgres');
+      const ref = schemaJson.refs.find(({ name }) => name === 'child_parent_fk');
+
+      expect(ref?.endpoints[0].fieldNames).toEqual(['a_zeta', 'z_alpha']);
+      expect(ref?.endpoints[1].fieldNames).toEqual(['zeta', 'alpha']);
+    } finally {
+      await client.query(`DROP SCHEMA IF EXISTS "${schema}" CASCADE`);
+      await client.end();
+    }
+  });
+
+  test('postgres keeps array column defaults that are not an ARRAY[...] list', async () => {
+    const testDir = path.join(__dirname, 'connectors', 'postgres');
+    const { connection } = JSON.parse(fs.readFileSync(path.join(testDir, 'connection.json'), 'utf-8'));
+    const schema = `dbml_array_default_${Math.random().toString(16).slice(2)}`;
+    const client = new Client({ connectionString: connection });
+
+    await client.connect();
+    try {
+      await client.query(`CREATE SCHEMA "${schema}"`);
+      await client.query(`
+        CREATE TABLE "${schema}".t (
+          literal_col varchar[] DEFAULT '{full_name,date_of_birth}',
+          empty_literal_col text[] DEFAULT '{}',
+          int_literal_col integer[] DEFAULT '{1,2}',
+          empty_array_col text[] DEFAULT ARRAY[]::text[],
+          function_col integer[] DEFAULT array_fill(0, ARRAY[3]),
+          array_col text[] DEFAULT ARRAY['a', 'b']
+        );
+      `);
+
+      const schemaJson = await connector.fetchSchemaJson(`${connection}?schemas=${schema}`, 'postgres');
+      const dbdefaults = Object.fromEntries(schemaJson.fields[`${schema}.t`].map(({ name, dbdefault }) => [name, dbdefault]));
+
+      expect(dbdefaults).toEqual({
+        literal_col: { type: 'string', value: '{full_name,date_of_birth}' },
+        empty_literal_col: { type: 'string', value: '{}' },
+        int_literal_col: { type: 'string', value: '{1,2}' },
+        empty_array_col: { type: 'expression', value: 'ARRAY[]::text[]' },
+        function_col: { type: 'expression', value: 'array_fill(0, ARRAY[3])' },
+        array_col: { type: 'expression', value: 'ARRAY[\'a\',  \'b\']' },
+      });
+    } finally {
+      await client.query(`DROP SCHEMA IF EXISTS "${schema}" CASCADE`);
+      await client.end();
+    }
+  });
 });

package/dist/index.js

@@ -3484,7 +3484,7 @@ sSi6
       ON obj.OBJECT_NAME = cols.TABLE_NAME
       AND obj.OBJECT_TYPE = 'TABLE'
     ORDER BY obj.CREATED, obj.OBJECT_ID, cols.COLUMN_ID
-  `,[],Xr)).rows?.reduce((e,n)=>{let{table_name:r,table_comment:i}=n;e[r]||(e[r]={name:r,schemaName:``,note:i?{value:i}:{value:``}}),t[r]||(t[r]=[]);let a=ri(n);return t[r].push(a),e},{})||{};return{tables:Object.values(n),fields:t}}function ni(e){if(e==null)return`expression`;let t=e.trim();return/^'.*'$/.test(t)?`string`:/^[0-9]+$/.test(t)||/^[0-9]*\.[0-9]*$/.test(t)?`number`:`expression`}function ri(e){let{column_name:t,data_type:n,data_length:r,data_precision:i,data_scale:a,identity_increment:o,is_nullable:s,data_default:c,column_comment:l}=e,u=ni(c),d=c&&!o?ii(c,u):null;return{name:t,type:{type_name:mi(n,r,i,a),schemaName:null},dbdefault:d,not_null:!s,increment:!!o,note:l?{value:l}:{value:``}}}function ii(e,t){return e===null?null:t===`string`?{value:e.trim().slice(1,-1).replaceAll(`''`,`'`),type:t}:{value:e,type:t}}var ai=new Set([`char`,`varchar2`,`nchar`,`nvarchar2`,`raw`,`urowid`,`character varying`,`character`,`char varying`,`nchar varying`,`varchar`,`national character varying`,`national character`,`national char varying`,`national char`]),oi=new Set([`float`]),si=`timestamp with local time zone`,ci=`timestamp with time zone`,li=`timestamp`,ui=`interval year to month`,di=`interval day to second`,fi=new Set([`number`,`numeric`,`decimal`,`dec`]);function pi(e){let t=e.split(` `).filter(Boolean).join(` `).toLowerCase();switch(t){case`anydata`:return`AnyData`;case`anytype`:return`AnyType`;case`anydataset`:return`AnyDataSet`;case`xmltype`:return`XMLType`;case`uritype`:return`URIType`;case`sdo_geometry`:return`SDO_Geometry`;case`sdo_topo_geometry`:return`SDO_Topo_Geometry`;case`sdo_georaster`:return`SDO_GeoRaster`;default:return t}}function mi(e,t,n,r){let i=pi(e);return i===si?r===null?i:`timestamp (${r}) with local time zone`:i===ci?r===null?i:`timestamp (${r}) with time zone`:i===li?r===null?i:`timestamp (${r})`:i===ui?n===null?i:`interval year (${n}) to month`:i===di?n!==null&&r!==null?`interval day (${n}) to second (${r})`:n===null?r===null?i:`interval day to second (${r})`:`interval day (${n}) to second`:ai.has(i)?t?`${i}(${t})`:i:oi.has(i)?n===null?i:`${i}(${n})`:fi.has(i)?n!==null&&r!==null?`${i}(${n}, ${r})`:n===null?i:`${i}(${n})`:i}var hi=async(e,t,n)=>{let r=await(0,h.getConnection)({username:e,password:t,connectionString:n});try{return await r.execute(`SELECT 1 FROM DUAL`),r}catch(e){throw await r.close(),e instanceof Error?Error(`OracleSQL connection error: ${e.message}`):e}};async function gi(e){let{username:t,password:n,dbidentifier:r}=Zr(e),i=await hi(t,n,r),a=ti(i),o=Qr(i),s=ei(i),c=$r(i),l=await Promise.all([a,o,s,c]),{tables:u,fields:d}=l[0],{indexes:f,tableConstraints:p,checks:m}=l[1],h=l[2],g=l[3];return Object.keys(f).forEach(e=>{g[e]?g[e].push(...f[e]):g[e]=f[e]}),await i.close(),{tables:u,fields:d,refs:h,enums:[],indexes:g,tableConstraints:p,checks:m}}var _i=async e=>{let t=new g.Client(e);try{return await t.connect(),await t.query(`SELECT 1`),t}catch(e){throw await t.end(),e instanceof Error?Error(`PostgreSQL connection error: ${e}`):e}},vi=e=>e===`YES`,yi=(e,t,n,r,i)=>e===`ARRAY`?`${t.slice(1,t.length)}[]`:n?`${t}(${n})`:r&&i?`${t}(${r},${i})`:t,bi=(e,t,n)=>{if(e===`ARRAY`)return{type:n,value:`ARRAY[${t.slice(6,-1).split(`,`).map(e=>e.split(`::`)[0]).join(`, `)}]`};if(n===`string`){let n=t.split(`::`)[0];return{type:e===`json`||e===`jsonb`?`expression`:`string`,value:n.slice(1,-1)}}return{type:n,value:t}},xi=e=>{let{column_name:t,data_type:n,character_maximum_length:r,numeric_precision:i,numeric_scale:a,udt_schema:o,udt_name:s,identity_increment:c,is_nullable:l,column_default:u,default_type:d,column_comment:f}=e,p=u&&d!==`increment`?bi(n,u,d):null;return{name:t,type:n===`USER-DEFINED`?{type_name:s,schemaName:o}:{type_name:yi(n,s,r,i,a),schemaName:null},dbdefault:p,not_null:!vi(l),increment:!!c||d===`increment`,note:f?{value:f}:{value:``}}},Si=async(e,t)=>{let n={},r=`
+  `,[],Xr)).rows?.reduce((e,n)=>{let{table_name:r,table_comment:i}=n;e[r]||(e[r]={name:r,schemaName:``,note:i?{value:i}:{value:``}}),t[r]||(t[r]=[]);let a=ri(n);return t[r].push(a),e},{})||{};return{tables:Object.values(n),fields:t}}function ni(e){if(e==null)return`expression`;let t=e.trim();return/^'.*'$/.test(t)?`string`:/^[0-9]+$/.test(t)||/^[0-9]*\.[0-9]*$/.test(t)?`number`:`expression`}function ri(e){let{column_name:t,data_type:n,data_length:r,data_precision:i,data_scale:a,identity_increment:o,is_nullable:s,data_default:c,column_comment:l}=e,u=ni(c),d=c&&!o?ii(c,u):null;return{name:t,type:{type_name:mi(n,r,i,a),schemaName:null},dbdefault:d,not_null:!s,increment:!!o,note:l?{value:l}:{value:``}}}function ii(e,t){return e===null?null:t===`string`?{value:e.trim().slice(1,-1).replaceAll(`''`,`'`),type:t}:{value:e,type:t}}var ai=new Set([`char`,`varchar2`,`nchar`,`nvarchar2`,`raw`,`urowid`,`character varying`,`character`,`char varying`,`nchar varying`,`varchar`,`national character varying`,`national character`,`national char varying`,`national char`]),oi=new Set([`float`]),si=`timestamp with local time zone`,ci=`timestamp with time zone`,li=`timestamp`,ui=`interval year to month`,di=`interval day to second`,fi=new Set([`number`,`numeric`,`decimal`,`dec`]);function pi(e){let t=e.split(` `).filter(Boolean).join(` `).toLowerCase();switch(t){case`anydata`:return`AnyData`;case`anytype`:return`AnyType`;case`anydataset`:return`AnyDataSet`;case`xmltype`:return`XMLType`;case`uritype`:return`URIType`;case`sdo_geometry`:return`SDO_Geometry`;case`sdo_topo_geometry`:return`SDO_Topo_Geometry`;case`sdo_georaster`:return`SDO_GeoRaster`;default:return t}}function mi(e,t,n,r){let i=pi(e);return i===si?r===null?i:`timestamp (${r}) with local time zone`:i===ci?r===null?i:`timestamp (${r}) with time zone`:i===li?r===null?i:`timestamp (${r})`:i===ui?n===null?i:`interval year (${n}) to month`:i===di?n!==null&&r!==null?`interval day (${n}) to second (${r})`:n===null?r===null?i:`interval day to second (${r})`:`interval day (${n}) to second`:ai.has(i)?t?`${i}(${t})`:i:oi.has(i)?n===null?i:`${i}(${n})`:fi.has(i)?n!==null&&r!==null?`${i}(${n}, ${r})`:n===null?i:`${i}(${n})`:i}var hi=async(e,t,n)=>{let r=await(0,h.getConnection)({username:e,password:t,connectionString:n});try{return await r.execute(`SELECT 1 FROM DUAL`),r}catch(e){throw await r.close(),e instanceof Error?Error(`OracleSQL connection error: ${e.message}`):e}};async function gi(e){let{username:t,password:n,dbidentifier:r}=Zr(e),i=await hi(t,n,r),a=ti(i),o=Qr(i),s=ei(i),c=$r(i),l=await Promise.all([a,o,s,c]),{tables:u,fields:d}=l[0],{indexes:f,tableConstraints:p,checks:m}=l[1],h=l[2],g=l[3];return Object.keys(f).forEach(e=>{g[e]?g[e].push(...f[e]):g[e]=f[e]}),await i.close(),{tables:u,fields:d,refs:h,enums:[],indexes:g,tableConstraints:p,checks:m}}var _i=async e=>{let t=new g.Client(e);try{return await t.connect(),await t.query(`SELECT 1`),t}catch(e){throw await t.end(),e instanceof Error?Error(`PostgreSQL connection error: ${e}`):e}},vi=e=>e===`YES`,yi=(e,t,n,r,i)=>e===`ARRAY`?`${t.slice(1,t.length)}[]`:n?`${t}(${n})`:r&&i?`${t}(${r},${i})`:t,bi=(e,t,n)=>{if(e===`ARRAY`&&t.startsWith(`ARRAY[`)&&!t.startsWith(`ARRAY[]`))return{type:n,value:`ARRAY[${t.slice(6,-1).split(`,`).map(e=>e.split(`::`)[0]).join(`, `)}]`};if(n===`string`){let n=t.split(`::`)[0];return{type:e===`json`||e===`jsonb`?`expression`:`string`,value:n.slice(1,-1)}}return{type:n,value:t}},xi=e=>{let{column_name:t,data_type:n,character_maximum_length:r,numeric_precision:i,numeric_scale:a,udt_schema:o,udt_name:s,identity_increment:c,is_nullable:l,column_default:u,default_type:d,column_comment:f}=e,p=u&&d!==`increment`?bi(n,u,d):null;return{name:t,type:n===`USER-DEFINED`?{type_name:s,schemaName:o}:{type_name:yi(n,s,r,i,a),schemaName:null},dbdefault:p,not_null:!vi(l),increment:!!c||d===`increment`,note:f?{value:f}:{value:``}}},Si=async(e,t)=>{let n={},r=`
     WITH
       comments AS (
         SELECT DISTINCT ON (pc.relname, pn.nspname, pa.attname)
@@ -3560,40 +3560,59 @@ sSi6
     ;
   `,i=(await e.query(r)).rows.reduce((e,t)=>{let{table_schema:r,table_name:i,table_comment:a}=t,o=`${r}.${i}`;e[o]||(e[o]={name:i,schemaName:r,note:a?{value:a}:{value:``}}),n[o]||(n[o]=[]);let s=xi(t);return n[o].push(s),e},{});return{tables:Object.values(i),fields:n}},Ci=async(e,t)=>{let n=[],r=`
     SELECT
-      tc.table_schema,
-      tc.table_name,
-      tc.constraint_name as fk_constraint_name,
-      STRING_AGG(DISTINCT kcu.column_name, ',') AS column_names,
-      ccu.table_schema AS foreign_table_schema,
-      ccu.table_name AS foreign_table_name,
-      STRING_AGG(DISTINCT ccu.column_name, ',') AS foreign_column_names,
-      tc.constraint_type,
-      rc.delete_rule AS on_delete,
-      rc.update_rule AS on_update
-    FROM information_schema.table_constraints AS tc
-    JOIN information_schema.key_column_usage AS kcu
-      ON tc.constraint_name = kcu.constraint_name
-      AND tc.table_schema = kcu.table_schema
-    JOIN information_schema.constraint_column_usage AS ccu
-      ON ccu.constraint_name = tc.constraint_name
-    JOIN information_schema.referential_constraints AS rc
-      ON tc.constraint_name = rc.constraint_name
-      AND tc.table_schema = rc.constraint_schema
-    WHERE tc.constraint_type = 'FOREIGN KEY'
-      AND tc.table_schema NOT IN ('pg_catalog', 'information_schema')
-      ${j(`tc.table_schema`,t)}
+      source_ns.nspname AS table_schema,
+      source_table.relname AS table_name,
+      constraint_row.conname AS fk_constraint_name,
+      STRING_AGG(source_column.attname, ',' ORDER BY key_column.ordinality) AS column_names,
+      target_ns.nspname AS foreign_table_schema,
+      target_table.relname AS foreign_table_name,
+      STRING_AGG(target_column.attname, ',' ORDER BY key_column.ordinality) AS foreign_column_names,
+      CASE constraint_row.confdeltype
+        WHEN 'a' THEN 'NO ACTION'
+        WHEN 'r' THEN 'RESTRICT'
+        WHEN 'c' THEN 'CASCADE'
+        WHEN 'n' THEN 'SET NULL'
+        WHEN 'd' THEN 'SET DEFAULT'
+      END AS on_delete,
+      CASE constraint_row.confupdtype
+        WHEN 'a' THEN 'NO ACTION'
+        WHEN 'r' THEN 'RESTRICT'
+        WHEN 'c' THEN 'CASCADE'
+        WHEN 'n' THEN 'SET NULL'
+        WHEN 'd' THEN 'SET DEFAULT'
+      END AS on_update
+    FROM pg_constraint AS constraint_row
+    JOIN pg_class AS source_table
+      ON constraint_row.conrelid = source_table.oid
+    JOIN pg_namespace AS source_ns
+      ON source_table.relnamespace = source_ns.oid
+    JOIN pg_class AS target_table
+      ON constraint_row.confrelid = target_table.oid
+    JOIN pg_namespace AS target_ns
+      ON target_table.relnamespace = target_ns.oid
+    JOIN LATERAL unnest(constraint_row.conkey, constraint_row.confkey)
+      WITH ORDINALITY AS key_column(source_attnum, target_attnum, ordinality)
+      ON TRUE
+    JOIN pg_attribute AS source_column
+      ON source_column.attrelid = source_table.oid
+      AND source_column.attnum = key_column.source_attnum
+    JOIN pg_attribute AS target_column
+      ON target_column.attrelid = target_table.oid
+      AND target_column.attnum = key_column.target_attnum
+    WHERE constraint_row.contype = 'f'
+      AND source_ns.nspname NOT IN ('pg_catalog', 'information_schema')
+      ${j(`source_ns.nspname`,t)}
     GROUP BY
-      tc.table_schema,
-      tc.table_name,
-      tc.constraint_name,
-      ccu.table_schema,
-      ccu.table_name,
-      tc.constraint_type,
-      rc.delete_rule,
-      rc.update_rule
+      source_ns.nspname,
+      source_table.relname,
+      constraint_row.conname,
+      target_ns.nspname,
+      target_table.relname,
+      constraint_row.confdeltype,
+      constraint_row.confupdtype
     ORDER BY
-      tc.table_schema,
-      tc.table_name;
+      source_ns.nspname,
+      source_table.relname;
   `;return(await e.query(r)).rows.forEach(e=>{let{table_schema:t,fk_constraint_name:r,table_name:i,column_names:a,foreign_table_schema:o,foreign_table_name:s,foreign_column_names:c,on_delete:l,on_update:u}=e,d={tableName:i,schemaName:t,fieldNames:a.split(`,`),relation:`0..*`},f={tableName:s,schemaName:o,fieldNames:c.split(`,`),relation:`0..1`};n.push({name:r,endpoints:[d,f],onDelete:l===`NO ACTION`?null:l,onUpdate:u===`NO ACTION`?null:u})}),n},wi=async(e,t)=>{let n=`
     WITH user_tables AS (
       SELECT

package/dist/index.mjs

@@ -9886,7 +9886,7 @@ var gi = async (e) => {
 		throw await t.end(), e instanceof Error ? Error(`PostgreSQL connection error: ${e}`) : e;
 	}
 }, _i = (e) => e === "YES", vi = (e, t, n, r, i) => e === "ARRAY" ? `${t.slice(1, t.length)}[]` : n ? `${t}(${n})` : r && i ? `${t}(${r},${i})` : t, yi = (e, t, n) => {
-	if (e === "ARRAY") return {
+	if (e === "ARRAY" && t.startsWith("ARRAY[") && !t.startsWith("ARRAY[]")) return {
 		type: n,
 		value: `ARRAY[${t.slice(6, -1).split(",").map((e) => e.split("::")[0]).join(", ")}]`
 	};
@@ -10009,40 +10009,59 @@ var gi = async (e) => {
 }, Si = async (e, t) => {
 	let n = [], r = `
     SELECT
-      tc.table_schema,
-      tc.table_name,
-      tc.constraint_name as fk_constraint_name,
-      STRING_AGG(DISTINCT kcu.column_name, ',') AS column_names,
-      ccu.table_schema AS foreign_table_schema,
-      ccu.table_name AS foreign_table_name,
-      STRING_AGG(DISTINCT ccu.column_name, ',') AS foreign_column_names,
-      tc.constraint_type,
-      rc.delete_rule AS on_delete,
-      rc.update_rule AS on_update
-    FROM information_schema.table_constraints AS tc
-    JOIN information_schema.key_column_usage AS kcu
-      ON tc.constraint_name = kcu.constraint_name
-      AND tc.table_schema = kcu.table_schema
-    JOIN information_schema.constraint_column_usage AS ccu
-      ON ccu.constraint_name = tc.constraint_name
-    JOIN information_schema.referential_constraints AS rc
-      ON tc.constraint_name = rc.constraint_name
-      AND tc.table_schema = rc.constraint_schema
-    WHERE tc.constraint_type = 'FOREIGN KEY'
-      AND tc.table_schema NOT IN ('pg_catalog', 'information_schema')
-      ${A("tc.table_schema", t)}
+      source_ns.nspname AS table_schema,
+      source_table.relname AS table_name,
+      constraint_row.conname AS fk_constraint_name,
+      STRING_AGG(source_column.attname, ',' ORDER BY key_column.ordinality) AS column_names,
+      target_ns.nspname AS foreign_table_schema,
+      target_table.relname AS foreign_table_name,
+      STRING_AGG(target_column.attname, ',' ORDER BY key_column.ordinality) AS foreign_column_names,
+      CASE constraint_row.confdeltype
+        WHEN 'a' THEN 'NO ACTION'
+        WHEN 'r' THEN 'RESTRICT'
+        WHEN 'c' THEN 'CASCADE'
+        WHEN 'n' THEN 'SET NULL'
+        WHEN 'd' THEN 'SET DEFAULT'
+      END AS on_delete,
+      CASE constraint_row.confupdtype
+        WHEN 'a' THEN 'NO ACTION'
+        WHEN 'r' THEN 'RESTRICT'
+        WHEN 'c' THEN 'CASCADE'
+        WHEN 'n' THEN 'SET NULL'
+        WHEN 'd' THEN 'SET DEFAULT'
+      END AS on_update
+    FROM pg_constraint AS constraint_row
+    JOIN pg_class AS source_table
+      ON constraint_row.conrelid = source_table.oid
+    JOIN pg_namespace AS source_ns
+      ON source_table.relnamespace = source_ns.oid
+    JOIN pg_class AS target_table
+      ON constraint_row.confrelid = target_table.oid
+    JOIN pg_namespace AS target_ns
+      ON target_table.relnamespace = target_ns.oid
+    JOIN LATERAL unnest(constraint_row.conkey, constraint_row.confkey)
+      WITH ORDINALITY AS key_column(source_attnum, target_attnum, ordinality)
+      ON TRUE
+    JOIN pg_attribute AS source_column
+      ON source_column.attrelid = source_table.oid
+      AND source_column.attnum = key_column.source_attnum
+    JOIN pg_attribute AS target_column
+      ON target_column.attrelid = target_table.oid
+      AND target_column.attnum = key_column.target_attnum
+    WHERE constraint_row.contype = 'f'
+      AND source_ns.nspname NOT IN ('pg_catalog', 'information_schema')
+      ${A("source_ns.nspname", t)}
     GROUP BY
-      tc.table_schema,
-      tc.table_name,
-      tc.constraint_name,
-      ccu.table_schema,
-      ccu.table_name,
-      tc.constraint_type,
-      rc.delete_rule,
-      rc.update_rule
+      source_ns.nspname,
+      source_table.relname,
+      constraint_row.conname,
+      target_ns.nspname,
+      target_table.relname,
+      constraint_row.confdeltype,
+      constraint_row.confupdtype
     ORDER BY
-      tc.table_schema,
-      tc.table_name;
+      source_ns.nspname,
+      source_table.relname;
   `;
 	return (await e.query(r)).rows.forEach((e) => {
 		let { table_schema: t, fk_constraint_name: r, table_name: i, column_names: a, foreign_table_schema: o, foreign_table_name: s, foreign_column_names: c, on_delete: l, on_update: u } = e, d = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/connector",
-  "version": "11.0.0-alpha.2",
+  "version": "11.0.0-alpha.4",
   "description": "This package was created to fetch the schema JSON from many kind of databases.",
   "author": "huy.phung.sw@gmail.com",
   "license": "MIT",
@@ -39,5 +39,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "75a0e5bf55149fef937ec7d02e48c170421229ff"
+  "gitHead": "40f71a2018dd2a5a9452cd4ba680ef08289fae3a"
 }

package/src/connectors/oracle/tables.ts

@@ -135,7 +135,7 @@ function getDbdefault (columnDefault: string | null, defaultType: string): Defau
 
 // Field type utils
 
-// These datatypes are never qualified: data size, data scale and data precision are all ignore.
+// These datatypes are never qualified: data size, data scale and data precision
 // Ref: https://docs.oracle.com/en/database/oracle/oracle-database/19/sqlrf/Data-Types.html
 const UNQUALIFIED_DATA_TYPES = new Set([
   // datetime

package/src/connectors/postgres/index.ts

@@ -54,7 +54,9 @@ const getFieldType = (data_type: string, udt_name: string, character_maximum_len
 };
 
 const getDbdefault = (data_type: string, column_default: string, default_type: DefaultType): DefaultInfo => {
-  if (data_type === 'ARRAY') {
+  // Only a non-empty ARRAY[...] constructor is rewritten here. Other array defaults, such as
+  // '{a,b}'::text[], ARRAY[]::text[] or a function call, are handled below like any other default
+  if (data_type === 'ARRAY' && column_default.startsWith('ARRAY[') && !column_default.startsWith('ARRAY[]')) {
     const values = column_default.slice(6, -1).split(',').map((value) => {
       return value.split('::')[0];
     });
@@ -228,40 +230,59 @@ const generateRawRefs = async (client: Client, schemas: string[]): Promise<Ref[]
 
   const refsListSql = `
     SELECT
-      tc.table_schema,
-      tc.table_name,
-      tc.constraint_name as fk_constraint_name,
-      STRING_AGG(DISTINCT kcu.column_name, ',') AS column_names,
-      ccu.table_schema AS foreign_table_schema,
-      ccu.table_name AS foreign_table_name,
-      STRING_AGG(DISTINCT ccu.column_name, ',') AS foreign_column_names,
-      tc.constraint_type,
-      rc.delete_rule AS on_delete,
-      rc.update_rule AS on_update
-    FROM information_schema.table_constraints AS tc
-    JOIN information_schema.key_column_usage AS kcu
-      ON tc.constraint_name = kcu.constraint_name
-      AND tc.table_schema = kcu.table_schema
-    JOIN information_schema.constraint_column_usage AS ccu
-      ON ccu.constraint_name = tc.constraint_name
-    JOIN information_schema.referential_constraints AS rc
-      ON tc.constraint_name = rc.constraint_name
-      AND tc.table_schema = rc.constraint_schema
-    WHERE tc.constraint_type = 'FOREIGN KEY'
-      AND tc.table_schema NOT IN ('pg_catalog', 'information_schema')
-      ${buildSchemaQuery('tc.table_schema', schemas)}
+      source_ns.nspname AS table_schema,
+      source_table.relname AS table_name,
+      constraint_row.conname AS fk_constraint_name,
+      STRING_AGG(source_column.attname, ',' ORDER BY key_column.ordinality) AS column_names,
+      target_ns.nspname AS foreign_table_schema,
+      target_table.relname AS foreign_table_name,
+      STRING_AGG(target_column.attname, ',' ORDER BY key_column.ordinality) AS foreign_column_names,
+      CASE constraint_row.confdeltype
+        WHEN 'a' THEN 'NO ACTION'
+        WHEN 'r' THEN 'RESTRICT'
+        WHEN 'c' THEN 'CASCADE'
+        WHEN 'n' THEN 'SET NULL'
+        WHEN 'd' THEN 'SET DEFAULT'
+      END AS on_delete,
+      CASE constraint_row.confupdtype
+        WHEN 'a' THEN 'NO ACTION'
+        WHEN 'r' THEN 'RESTRICT'
+        WHEN 'c' THEN 'CASCADE'
+        WHEN 'n' THEN 'SET NULL'
+        WHEN 'd' THEN 'SET DEFAULT'
+      END AS on_update
+    FROM pg_constraint AS constraint_row
+    JOIN pg_class AS source_table
+      ON constraint_row.conrelid = source_table.oid
+    JOIN pg_namespace AS source_ns
+      ON source_table.relnamespace = source_ns.oid
+    JOIN pg_class AS target_table
+      ON constraint_row.confrelid = target_table.oid
+    JOIN pg_namespace AS target_ns
+      ON target_table.relnamespace = target_ns.oid
+    JOIN LATERAL unnest(constraint_row.conkey, constraint_row.confkey)
+      WITH ORDINALITY AS key_column(source_attnum, target_attnum, ordinality)
+      ON TRUE
+    JOIN pg_attribute AS source_column
+      ON source_column.attrelid = source_table.oid
+      AND source_column.attnum = key_column.source_attnum
+    JOIN pg_attribute AS target_column
+      ON target_column.attrelid = target_table.oid
+      AND target_column.attnum = key_column.target_attnum
+    WHERE constraint_row.contype = 'f'
+      AND source_ns.nspname NOT IN ('pg_catalog', 'information_schema')
+      ${buildSchemaQuery('source_ns.nspname', schemas)}
     GROUP BY
-      tc.table_schema,
-      tc.table_name,
-      tc.constraint_name,
-      ccu.table_schema,
-      ccu.table_name,
-      tc.constraint_type,
-      rc.delete_rule,
-      rc.update_rule
+      source_ns.nspname,
+      source_table.relname,
+      constraint_row.conname,
+      target_ns.nspname,
+      target_table.relname,
+      constraint_row.confdeltype,
+      constraint_row.confupdtype
     ORDER BY
-      tc.table_schema,
-      tc.table_name;
+      source_ns.nspname,
+      source_table.relname;
   `;
 
   const refsQueryResult = await client.query(refsListSql);