@dbml/connector 9.0.0-optional-ref.0 → 9.0.0-optional-ref.6

package/__tests__/connectors/mssql/expect-out-files/schema.json

@@ -1721,7 +1721,7 @@
             "AuthorID",
             "NationalityID"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "Authors",
@@ -1730,7 +1730,7 @@
             "AuthorID",
             "NationalityID"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": null,
@@ -1745,7 +1745,7 @@
           "fieldNames": [
             "product_id"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "products",
@@ -1753,7 +1753,7 @@
           "fieldNames": [
             "product_id"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": null,
@@ -1768,7 +1768,7 @@
           "fieldNames": [
             "order_id"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "orders",
@@ -1776,7 +1776,7 @@
           "fieldNames": [
             "order_id"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "CASCADE",
@@ -1791,7 +1791,7 @@
           "fieldNames": [
             "user_id"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "users",
@@ -1799,7 +1799,7 @@
           "fieldNames": [
             "user_id"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "CASCADE",
@@ -1814,7 +1814,7 @@
           "fieldNames": [
             "gender"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "gender_reference",
@@ -1822,7 +1822,7 @@
           "fieldNames": [
             "value"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": null,

package/__tests__/connectors/mysql/expect-out-files/schema.json

@@ -1094,7 +1094,7 @@
             "id1_1",
             "id1_2"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "composite_key_2",
@@ -1102,7 +1102,7 @@
             "id2_1",
             "id2_2"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": null,
@@ -1116,14 +1116,14 @@
           "fieldNames": [
             "order_id"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "orders",
           "fieldNames": [
             "order_id"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "CASCADE",
@@ -1137,14 +1137,14 @@
           "fieldNames": [
             "product_id"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "products",
           "fieldNames": [
             "id"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": null,
@@ -1158,14 +1158,14 @@
           "fieldNames": [
             "user_id"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "users",
           "fieldNames": [
             "user_id"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "SET NULL",

package/__tests__/connectors/oracle/expect-out-files/schema.json

@@ -2921,7 +2921,7 @@
           "fieldNames": [
             "PARENT_ID"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "SELF_REF_FK",
@@ -2929,7 +2929,7 @@
           "fieldNames": [
             "ID"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "SET NULL",
@@ -2944,7 +2944,7 @@
           "fieldNames": [
             "PARENT_ID"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "FK_PARENT",
@@ -2952,7 +2952,7 @@
           "fieldNames": [
             "ID"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "CASCADE",
@@ -2968,7 +2968,7 @@
             "PARENT_DEPT_ID",
             "PARENT_EMP_ID"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "COMPOSITE_SELF_REF",
@@ -2977,7 +2977,7 @@
             "DEPT_ID",
             "EMP_ID"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "SET NULL",
@@ -2992,7 +2992,7 @@
           "fieldNames": [
             "PARENT_ID"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "ALTER_FK_PARENT",
@@ -3000,7 +3000,7 @@
           "fieldNames": [
             "ID"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "CASCADE",
@@ -3015,7 +3015,7 @@
           "fieldNames": [
             "PARENT_ID"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "ALTER_SELF_REF",
@@ -3023,7 +3023,7 @@
           "fieldNames": [
             "ID"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "SET NULL",
@@ -3039,7 +3039,7 @@
             "REF_DEPT_ID",
             "REF_EMP_ID"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "ALTER_COMPOSITE_FK_PARENT",
@@ -3048,7 +3048,7 @@
             "DEPT_ID",
             "EMP_ID"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": null,
@@ -3063,7 +3063,7 @@
           "fieldNames": [
             "PARENT_ID"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "REF_SIMPLE_PARENT",
@@ -3071,7 +3071,7 @@
           "fieldNames": [
             "ID"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": null,
@@ -3087,7 +3087,7 @@
             "FK1",
             "FK2"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "REF_COMPOSITE_PARENT",
@@ -3096,7 +3096,7 @@
             "KEY1",
             "KEY2"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": null,
@@ -3112,7 +3112,7 @@
             "PARENT_DEPT_ID",
             "PARENT_EMP_ID"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "ALTER_COMP_SELF_REF",
@@ -3121,7 +3121,7 @@
             "DEPT_ID",
             "EMP_ID"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": null,

package/__tests__/connectors/postgres/expect-out-files/schema.json

@@ -1344,7 +1344,7 @@
             "authorid",
             "nationalityid"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "authors",
@@ -1353,7 +1353,7 @@
             "authorid",
             "nationalityid"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "CASCADE",
@@ -1368,7 +1368,7 @@
           "fieldNames": [
             "order_id"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "orders",
@@ -1376,7 +1376,7 @@
           "fieldNames": [
             "order_id"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "CASCADE",
@@ -1391,7 +1391,7 @@
           "fieldNames": [
             "product_id"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "products",
@@ -1399,7 +1399,7 @@
           "fieldNames": [
             "product_id"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "CASCADE",
@@ -1414,7 +1414,7 @@
           "fieldNames": [
             "user_id"
           ],
-          "relation": "*"
+          "relation": "0..*"
         },
         {
           "tableName": "users",
@@ -1422,7 +1422,7 @@
           "fieldNames": [
             "user_id"
           ],
-          "relation": "1"
+          "relation": "0..1"
         }
       ],
       "onDelete": "CASCADE",

package/dist/connectors/types.d.ts

@@ -49,7 +49,7 @@ interface RefEndpoint {
     tableName: string;
     schemaName: string;
     fieldNames: string[];
-    relation: '*' | '1';
+    relation: string;
 }
 interface Ref {
     name: string;

package/dist/index.js

@@ -168,7 +168,7 @@ Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});var e=Object.
     ORDER BY
       s.name,
       t.name;
-  `,i=await e.query(r),a=(e,t)=>e.length===t.length?e.every((e,n)=>e.tableName===t[n].tableName&&e.schemaName===t[n].schemaName&&e.fieldNames.length===t[n].fieldNames.length&&e.fieldNames.every((e,r)=>e===t[n].fieldNames[r])):!1;return i.recordset.forEach(e=>{let{table_schema:t,fk_constraint_name:r,table_name:i,column_names:o,foreign_table_schema:s,foreign_table_name:c,foreign_column_names:l,on_delete:u,on_update:d}=e,f={name:r,endpoints:[{tableName:i,schemaName:t,fieldNames:o.split(`,`),relation:`*`},{tableName:c,schemaName:s,fieldNames:l.split(`,`),relation:`1`}],onDelete:u===`NO_ACTION`?null:u,onUpdate:d===`NO_ACTION`?null:d};n.some(e=>a(e.endpoints,f.endpoints))||n.push(f)}),n},he=async(e,t)=>{let n=`
+  `,i=await e.query(r),a=(e,t)=>e.length===t.length?e.every((e,n)=>e.tableName===t[n].tableName&&e.schemaName===t[n].schemaName&&e.fieldNames.length===t[n].fieldNames.length&&e.fieldNames.every((e,r)=>e===t[n].fieldNames[r])):!1;return i.recordset.forEach(e=>{let{table_schema:t,fk_constraint_name:r,table_name:i,column_names:o,foreign_table_schema:s,foreign_table_name:c,foreign_column_names:l,on_delete:u,on_update:d}=e,f={name:r,endpoints:[{tableName:i,schemaName:t,fieldNames:o.split(`,`),relation:`0..*`},{tableName:c,schemaName:s,fieldNames:l.split(`,`),relation:`0..1`}],onDelete:u===`NO_ACTION`?null:u,onUpdate:d===`NO_ACTION`?null:d};n.some(e=>a(e.endpoints,f.endpoints))||n.push(f)}),n},he=async(e,t)=>{let n=`
     WITH user_tables AS (
       SELECT
         TABLE_SCHEMA,
@@ -3357,7 +3357,7 @@ sSi6
       rc.delete_rule
     order by
       rc.table_name;
-  `,[t]))[0].map(e=>{let{constraintName:t,onDelete:n,onUpdate:r,foreignTableName:i,foreignColumnNames:a,refTableName:o,refColumnNames:s}=e;return{name:t,endpoints:[{tableName:i,fieldNames:a.split(`,`),relation:`*`},{tableName:o,fieldNames:s.split(`,`),relation:`1`}],onDelete:n===`NO ACTION`?null:n,onUpdate:r===`NO ACTION`?null:r}})}function Nr(e,t){let n=Object.assign(e,{});return Object.keys(t).forEach(e=>{let r=t[e];if(!n[e]){n[e]=r;return}n[e].push(...r)}),n}async function Pr(e){let t=await yr(e),{database:n}=t.config;if(!n)throw Error(`Cannot get schema name from the connection`);try{let[{tableList:e,fieldMap:r},i,a,{primaryAndUniqueConstraintMap:o,compositeConstraintMap:s},c,{checks:l,tableConstraints:u}]=await Promise.all([Er(t,n),Dr(t,n),Or(t,n),kr(t,n),Mr(t,n),jr(t,n)]),d=Nr(a,s),f={...o};return Object.keys(u).forEach(e=>{f[e]||(f[e]={}),Object.keys(u[e]).forEach(t=>{f[e][t]||(f[e][t]={checks:[]}),f[e][t].checks.push(...u[e][t].checks)})}),{tables:e,fields:r,refs:c,enums:i,indexes:d,tableConstraints:f,checks:l}}finally{await t.end()}}var $=`@@@@@@@@`,Fr={outFormat:h.default.OUT_FORMAT_OBJECT};function Ir(e){let{username:t,password:n,dbidentifier:r}=e.match(/^(?<username>[^/@:]+)\/(?<password>[^/@:]+)@(\/\/)?(?<dbidentifier>.+)$/)?.groups||{};if(!t||!n||!r)throw Error(`Invalid Easy Connect string. Expect a string of format 'username/password@[//]host[:port][/database]'`);return{username:t,password:n,dbidentifier:r}}async function Lr(e){let t=`
+  `,[t]))[0].map(e=>{let{constraintName:t,onDelete:n,onUpdate:r,foreignTableName:i,foreignColumnNames:a,refTableName:o,refColumnNames:s}=e;return{name:t,endpoints:[{tableName:i,fieldNames:a.split(`,`),relation:`0..*`},{tableName:o,fieldNames:s.split(`,`),relation:`0..1`}],onDelete:n===`NO ACTION`?null:n,onUpdate:r===`NO ACTION`?null:r}})}function Nr(e,t){let n=Object.assign(e,{});return Object.keys(t).forEach(e=>{let r=t[e];if(!n[e]){n[e]=r;return}n[e].push(...r)}),n}async function Pr(e){let t=await yr(e),{database:n}=t.config;if(!n)throw Error(`Cannot get schema name from the connection`);try{let[{tableList:e,fieldMap:r},i,a,{primaryAndUniqueConstraintMap:o,compositeConstraintMap:s},c,{checks:l,tableConstraints:u}]=await Promise.all([Er(t,n),Dr(t,n),Or(t,n),kr(t,n),Mr(t,n),jr(t,n)]),d=Nr(a,s),f={...o};return Object.keys(u).forEach(e=>{f[e]||(f[e]={}),Object.keys(u[e]).forEach(t=>{f[e][t]||(f[e][t]={checks:[]}),f[e][t].checks.push(...u[e][t].checks)})}),{tables:e,fields:r,refs:c,enums:i,indexes:d,tableConstraints:f,checks:l}}finally{await t.end()}}var $=`@@@@@@@@`,Fr={outFormat:h.default.OUT_FORMAT_OBJECT};function Ir(e){let{username:t,password:n,dbidentifier:r}=e.match(/^(?<username>[^/@:]+)\/(?<password>[^/@:]+)@(\/\/)?(?<dbidentifier>.+)$/)?.groups||{};if(!t||!n||!r)throw Error(`Invalid Easy Connect string. Expect a string of format 'username/password@[//]host[:port][/database]'`);return{username:t,password:n,dbidentifier:r}}async function Lr(e){let t=`
     WITH all_constraints AS (
       SELECT
         c.CONSTRAINT_NAME,
@@ -3456,7 +3456,7 @@ sSi6
       obj_child.CREATED,
       obj_child.OBJECT_ID,
       c.CONSTRAINT_NAME
-  `;return(await e.execute(n,[],Fr)).rows?.forEach(e=>{let{fk_name:n,child_table:r,child_columns:i,parent_table:a,parent_columns:o,delete_rule:s}=e,c={tableName:r,schemaName:``,fieldNames:i.split($),relation:`*`},l={tableName:a,schemaName:``,fieldNames:o.split($),relation:`1`};t.push({name:n,endpoints:[c,l],onDelete:s===`NO ACTION`?null:s,onUpdate:null})}),t}async function Br(e){let t={},n=(await e.execute(`
+  `;return(await e.execute(n,[],Fr)).rows?.forEach(e=>{let{fk_name:n,child_table:r,child_columns:i,parent_table:a,parent_columns:o,delete_rule:s}=e,c={tableName:r,schemaName:``,fieldNames:i.split($),relation:`0..*`},l={tableName:a,schemaName:``,fieldNames:o.split($),relation:`0..1`};t.push({name:n,endpoints:[c,l],onDelete:s===`NO ACTION`?null:s,onUpdate:null})}),t}async function Br(e){let t={},n=(await e.execute(`
     SELECT
       cols.TABLE_NAME AS "table_name",
       cols.COLUMN_NAME AS "column_name",
@@ -3591,7 +3591,7 @@ sSi6
     ORDER BY
       tc.table_schema,
       tc.table_name;
-  `;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:`*`},f={tableName:s,schemaName:o,fieldNames:c.split(`,`),relation:`1`};n.push({name:r,endpoints:[d,f],onDelete:l===`NO ACTION`?null:l,onUpdate:u===`NO ACTION`?null:u})}),n},li=async(e,t)=>{let n=`
+  `;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},li=async(e,t)=>{let n=`
     WITH user_tables AS (
       SELECT
         schemaname AS tableschema,

package/dist/index.mjs

@@ -455,12 +455,12 @@ var ie = "schemas=", A = (e) => e.toLowerCase().includes(ie), ae = (e) => e ? e.
 				tableName: i,
 				schemaName: t,
 				fieldNames: o.split(","),
-				relation: "*"
+				relation: "0..*"
 			}, {
 				tableName: c,
 				schemaName: s,
 				fieldNames: l.split(","),
-				relation: "1"
+				relation: "0..1"
 			}],
 			onDelete: u === "NO_ACTION" ? null : u,
 			onUpdate: d === "NO_ACTION" ? null : d
@@ -9445,11 +9445,11 @@ async function jr(e, t) {
 			endpoints: [{
 				tableName: i,
 				fieldNames: a.split(","),
-				relation: "*"
+				relation: "0..*"
 			}, {
 				tableName: o,
 				fieldNames: s.split(","),
-				relation: "1"
+				relation: "0..1"
 			}],
 			onDelete: n === "NO ACTION" ? null : n,
 			onUpdate: r === "NO ACTION" ? null : r
@@ -9677,12 +9677,12 @@ async function Rr(e) {
 			tableName: r,
 			schemaName: "",
 			fieldNames: i.split($),
-			relation: "*"
+			relation: "0..*"
 		}, l = {
 			tableName: a,
 			schemaName: "",
 			fieldNames: o.split($),
-			relation: "1"
+			relation: "0..1"
 		};
 		t.push({
 			name: n,
@@ -9984,12 +9984,12 @@ var ti = async (e) => {
 			tableName: i,
 			schemaName: t,
 			fieldNames: a.split(","),
-			relation: "*"
+			relation: "0..*"
 		}, f = {
 			tableName: s,
 			schemaName: o,
 			fieldNames: c.split(","),
-			relation: "1"
+			relation: "0..1"
 		};
 		n.push({
 			name: r,

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/connector",
-  "version": "9.0.0-optional-ref.0",
+  "version": "9.0.0-optional-ref.6",
   "description": "This package was created to fetch the schema JSON from many kind of databases.",
   "author": "huy.phung.sw@gmail.com",
   "license": "MIT",
@@ -38,5 +38,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "01feeb4d524ff11d6cfaad16730a27c73e0d3b1f"
+  "gitHead": "9d8aa4b58c6ceae262252ea590e05e3e966c10e6"
 }

package/src/connectors/mssql/index.ts

@@ -315,14 +315,14 @@ const generateRefs = async (client: sql.ConnectionPool, schemas: string[]): Prom
       tableName: table_name,
       schemaName: table_schema,
       fieldNames: column_names.split(','),
-      relation: '*',
+      relation: '0..*',
     };
 
     const ep2: RefEndpoint = {
       tableName: foreign_table_name,
       schemaName: foreign_table_schema,
       fieldNames: foreign_column_names.split(','),
-      relation: '1',
+      relation: '0..1',
     };
 
     const newRef = {

package/src/connectors/mysql/index.ts

@@ -486,13 +486,13 @@ async function generateForeignKeys (client: Connection, schemaName: string): Pro
     const endpoint1 = {
       tableName: foreignTableName,
       fieldNames: foreignColumnNames.split(','),
-      relation: '*',
+      relation: '0..*',
     };
 
     const endpoint2 = {
       tableName: refTableName,
       fieldNames: refColumnNames.split(','),
-      relation: '1',
+      relation: '0..1',
     };
 
     return {

package/src/connectors/oracle/refs.ts

@@ -51,14 +51,14 @@ export async function generateRawRefs (client: Connection): Promise<Ref[]> {
       tableName: child_table,
       schemaName: '',
       fieldNames: child_columns.split(LIST_SEPARATOR),
-      relation: '*',
+      relation: '0..*',
     };
 
     const ep2: RefEndpoint = {
       tableName: parent_table,
       schemaName: '',
       fieldNames: parent_columns.split(LIST_SEPARATOR),
-      relation: '1',
+      relation: '0..1',
     };
 
     refs.push({

package/src/connectors/postgres/index.ts

@@ -282,14 +282,14 @@ const generateRawRefs = async (client: Client, schemas: string[]): Promise<Ref[]
       tableName: table_name,
       schemaName: table_schema,
       fieldNames: column_names.split(','),
-      relation: '*',
+      relation: '0..*',
     };
 
     const ep2: RefEndpoint = {
       tableName: foreign_table_name,
       schemaName: foreign_table_schema,
       fieldNames: foreign_column_names.split(','),
-      relation: '1',
+      relation: '0..1',
     };
 
     refs.push({

package/src/connectors/types.ts

@@ -60,7 +60,7 @@ interface RefEndpoint {
   tableName: string; // Parent table or child table
   schemaName: string;
   fieldNames: string[]; // The parent fields or the child fields (foreign key fields)
-  relation: '*' | '1'; // The parent endpoint is '*' and the child endpoint is '1'
+  relation: string; // The parent endpoint is '0..*' and the child endpoint is '0..1'
 }
 
 interface Ref {