@dbml/connector 3.9.3 → 3.9.4

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

@@ -97,6 +97,27 @@
       "note": {
         "value": ""
       }
+    },
+    {
+      "name": "table_same_fk",
+      "schemaName": "public",
+      "note": {
+        "value": ""
+      }
+    },
+    {
+      "name": "table_same_fk_1",
+      "schemaName": "public",
+      "note": {
+        "value": ""
+      }
+    },
+    {
+      "name": "table_same_fk_2",
+      "schemaName": "public",
+      "note": {
+        "value": ""
+      }
     }
   ],
   "fields": {
@@ -1270,6 +1291,77 @@
           "value": ""
         }
       }
+    ],
+    "public.table_same_fk": [
+      {
+        "name": "id",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": true,
+        "note": {
+          "value": ""
+        }
+      }
+    ],
+    "public.table_same_fk_1": [
+      {
+        "name": "id",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": true,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "fk_id_1",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": false,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      }
+    ],
+    "public.table_same_fk_2": [
+      {
+        "name": "id",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": true,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "fk_id_2",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": false,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      }
     ]
   },
   "refs": [
@@ -1366,6 +1458,54 @@
       ],
       "onDelete": "CASCADE",
       "onUpdate": null
+    },
+    {
+      "name": "fk_same_name_test",
+      "endpoints": [
+        {
+          "tableName": "table_same_fk_1",
+          "schemaName": "public",
+          "fieldNames": [
+            "fk_id_1",
+            "fk_id_2"
+          ],
+          "relation": "*"
+        },
+        {
+          "tableName": "table_same_fk",
+          "schemaName": "public",
+          "fieldNames": [
+            "id"
+          ],
+          "relation": "1"
+        }
+      ],
+      "onDelete": null,
+      "onUpdate": null
+    },
+    {
+      "name": "fk_same_name_test",
+      "endpoints": [
+        {
+          "tableName": "table_same_fk_2",
+          "schemaName": "public",
+          "fieldNames": [
+            "fk_id_1",
+            "fk_id_2"
+          ],
+          "relation": "*"
+        },
+        {
+          "tableName": "table_same_fk",
+          "schemaName": "public",
+          "fieldNames": [
+            "id"
+          ],
+          "relation": "1"
+        }
+      ],
+      "onDelete": null,
+      "onUpdate": null
     }
   ],
   "enums": [
@@ -1594,6 +1734,21 @@
         "pk": true
       }
     },
+    "public.table_same_fk": {
+      "id": {
+        "pk": true
+      }
+    },
+    "public.table_same_fk_1": {
+      "id": {
+        "pk": true
+      }
+    },
+    "public.table_same_fk_2": {
+      "id": {
+        "pk": true
+      }
+    },
     "public.table_with_comments": {
       "id": {
         "pk": true

package/dist/connectors/bigqueryConnector.js

@@ -93,7 +93,7 @@ async function generateTablesAndFields(client, projectId, datasetId) {
       t.table_schema = c.table_schema
       and t.table_name = c.table_name
     where t.table_type = 'BASE TABLE'
-    order by t.create_time, c.ordinal_position;
+    order by t.creation_time, c.ordinal_position;
   `;
     const [queryResult] = await client.query({ query });
     const tableMap = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/connector",
-  "version": "3.9.3",
+  "version": "3.9.4",
   "description": "This package was created to fetch the schema JSON from many kind of databases.",
   "author": "huy.phung.sw@gmail.com",
   "license": "MIT",
@@ -40,5 +40,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "f78c1f65fcf3f7edc472fbe2038abf1fd56dccdb"
+  "gitHead": "7dcc73bb327aa5603e3d9b6fec2b1b2e6f3f82da"
 }

package/src/connectors/bigqueryConnector.ts

@@ -137,7 +137,7 @@ async function generateTablesAndFields(
       t.table_schema = c.table_schema
       and t.table_name = c.table_name
     where t.table_type = 'BASE TABLE'
-    order by t.create_time, c.ordinal_position;
+    order by t.creation_time, c.ordinal_position;
   `;
 
   const [queryResult] = await client.query({ query });