@dbml/connector 3.9.2 → 3.9.3

package/dist/connectors/bigqueryConnector.js

@@ -93,14 +93,9 @@ 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.table_name, c.ordinal_position;
+    order by t.create_time, c.ordinal_position;
   `;
-    const [queryResult] = await client.query({
-        query,
-        params: {
-        // stringRegex: STRING_REGEX,
-        },
-    });
+    const [queryResult] = await client.query({ query });
     const tableMap = {};
     const fieldMap = {};
     queryResult.forEach((row) => {

package/dist/connectors/mssqlConnector.js

@@ -136,7 +136,9 @@ const generateTablesFieldsAndEnums = async (client, schemas) => {
       SELECT
         s.name AS table_schema,
         t.name AS table_name,
+        t.create_date as table_create_date,
         c.name AS column_name,
+        c.column_id as column_id,
         ty.name AS data_type,
         c.max_length AS character_maximum_length,
         c.precision AS numeric_precision,
@@ -223,8 +225,8 @@ const generateTablesFieldsAndEnums = async (client, schemas) => {
       ${(0, parseSchema_1.buildSchemaQuery)('table_schema', schemas)}
     ORDER BY
       table_schema,
-      table_name,
-      column_name;
+      table_create_date,
+      column_id;
   `;
     const tablesAndFieldsResult = await client.query(tablesAndFieldsSql);
     const tables = tablesAndFieldsResult.recordset.reduce((acc, row) => {

package/dist/connectors/postgresConnector.js

@@ -82,24 +82,40 @@ const generateField = (row) => {
 const generateTablesAndFields = async (client, schemas) => {
     const fields = {};
     const tablesAndFieldsSql = `
-    WITH comments AS (
-      SELECT DISTINCT ON (pc.relname, pn.nspname, pa.attname)
-        pc.relname AS table_name,
-        pn.nspname AS table_schema,
-        pa.attname AS column_name,
-        pd.description
-      FROM
-        pg_description pd
-      JOIN
-        pg_class pc ON pd.objoid = pc.oid
-      JOIN
-        pg_namespace pn ON pc.relnamespace = pn.oid
-      LEFT JOIN
-        pg_attribute pa ON pd.objoid = pa.attrelid AND pd.objsubid = pa.attnum
-      WHERE
-        pc.relkind = 'r'
-        AND pn.nspname NOT IN ('pg_catalog', 'information_schema')
-    )
+    WITH
+      comments AS (
+        SELECT DISTINCT ON (pc.relname, pn.nspname, pa.attname)
+          pc.relname AS table_name,
+          pn.nspname AS table_schema,
+          pa.attname AS column_name,
+          pd.description
+        FROM
+          pg_description pd
+        JOIN
+          pg_class pc ON pd.objoid = pc.oid
+        JOIN
+          pg_namespace pn ON pc.relnamespace = pn.oid
+        LEFT JOIN
+          pg_attribute pa ON pd.objoid = pa.attrelid AND pd.objsubid = pa.attnum
+        WHERE
+          pc.relkind = 'r'
+          AND pn.nspname NOT IN ('pg_catalog', 'information_schema')
+      ),
+      table_positions AS (
+        SELECT
+          pc.oid as table_ordinal_position,
+          pc.relname as table_name,
+          pn.nspname as table_schema
+        FROM pg_class pc
+        JOIN pg_namespace pn
+        ON pc.relnamespace = pn.oid
+        WHERE
+          -- r is ordinary table
+          -- see https://www.postgresql.org/docs/14/catalog-pg-class.html#:~:text=%3D%20temporary%20table-,relkind,-char
+          pc.relkind = 'r'
+          AND pn.nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
+          ${(0, parseSchema_1.buildSchemaQuery)('t.table_schema', schemas)}
+      )
     SELECT
       t.table_schema,
       t.table_name,
@@ -128,13 +144,15 @@ const generateTablesAndFields = async (client, schemas) => {
       information_schema.columns c
     JOIN
       information_schema.tables t ON c.table_name = t.table_name AND c.table_schema = t.table_schema
+    JOIN
+      table_positions tp ON tp.table_name = t.table_name AND tp.table_schema = t.table_schema
     WHERE
       t.table_type = 'BASE TABLE'
       AND t.table_schema NOT IN ('pg_catalog', 'information_schema')
       ${(0, parseSchema_1.buildSchemaQuery)('t.table_schema', schemas)}
     ORDER BY
       t.table_schema,
-      t.table_name,
+      tp.table_ordinal_position,
       c.ordinal_position
     ;
   `;

package/dist/connectors/snowflakeConnector.js

@@ -159,7 +159,7 @@ const generateTablesAndFields = async (conn, schemas) => {
         ${schemaSql}
     ORDER BY
         c.table_schema,
-        c.table_name,
+        t.created,
         c.ordinal_position;
   `;
     const tablesAndFieldsResult = await executeQuery(conn, tablesAndFieldsSql);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/connector",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "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": "3e9e33e62a49bd91268a71e47fe89aed4a683518"
+  "gitHead": "f78c1f65fcf3f7edc472fbe2038abf1fd56dccdb"
 }

package/src/connectors/bigqueryConnector.ts

@@ -137,15 +137,10 @@ 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.table_name, c.ordinal_position;
+    order by t.create_time, c.ordinal_position;
   `;
 
-  const [queryResult] = await client.query({
-    query,
-    params: {
-      // stringRegex: STRING_REGEX,
-    },
-  });
+  const [queryResult] = await client.query({ query });
 
   const tableMap: Record<string, Table> = {};
   const fieldMap: FieldsDictionary = {};

package/src/connectors/mssqlConnector.ts

@@ -178,7 +178,9 @@ const generateTablesFieldsAndEnums = async (client: sql.ConnectionPool, schemas:
       SELECT
         s.name AS table_schema,
         t.name AS table_name,
+        t.create_date as table_create_date,
         c.name AS column_name,
+        c.column_id as column_id,
         ty.name AS data_type,
         c.max_length AS character_maximum_length,
         c.precision AS numeric_precision,
@@ -265,8 +267,8 @@ const generateTablesFieldsAndEnums = async (client: sql.ConnectionPool, schemas:
       ${buildSchemaQuery('table_schema', schemas)}
     ORDER BY
       table_schema,
-      table_name,
-      column_name;
+      table_create_date,
+      column_id;
   `;
 
   const tablesAndFieldsResult = await client.query(tablesAndFieldsSql);

package/src/connectors/postgresConnector.ts

@@ -120,24 +120,40 @@ const generateTablesAndFields = async (client: Client, schemas: string[]): Promi
 }> => {
   const fields: FieldsDictionary = {};
   const tablesAndFieldsSql = `
-    WITH comments AS (
-      SELECT DISTINCT ON (pc.relname, pn.nspname, pa.attname)
-        pc.relname AS table_name,
-        pn.nspname AS table_schema,
-        pa.attname AS column_name,
-        pd.description
-      FROM
-        pg_description pd
-      JOIN
-        pg_class pc ON pd.objoid = pc.oid
-      JOIN
-        pg_namespace pn ON pc.relnamespace = pn.oid
-      LEFT JOIN
-        pg_attribute pa ON pd.objoid = pa.attrelid AND pd.objsubid = pa.attnum
-      WHERE
-        pc.relkind = 'r'
-        AND pn.nspname NOT IN ('pg_catalog', 'information_schema')
-    )
+    WITH
+      comments AS (
+        SELECT DISTINCT ON (pc.relname, pn.nspname, pa.attname)
+          pc.relname AS table_name,
+          pn.nspname AS table_schema,
+          pa.attname AS column_name,
+          pd.description
+        FROM
+          pg_description pd
+        JOIN
+          pg_class pc ON pd.objoid = pc.oid
+        JOIN
+          pg_namespace pn ON pc.relnamespace = pn.oid
+        LEFT JOIN
+          pg_attribute pa ON pd.objoid = pa.attrelid AND pd.objsubid = pa.attnum
+        WHERE
+          pc.relkind = 'r'
+          AND pn.nspname NOT IN ('pg_catalog', 'information_schema')
+      ),
+      table_positions AS (
+        SELECT
+          pc.oid as table_ordinal_position,
+          pc.relname as table_name,
+          pn.nspname as table_schema
+        FROM pg_class pc
+        JOIN pg_namespace pn
+        ON pc.relnamespace = pn.oid
+        WHERE
+          -- r is ordinary table
+          -- see https://www.postgresql.org/docs/14/catalog-pg-class.html#:~:text=%3D%20temporary%20table-,relkind,-char
+          pc.relkind = 'r'
+          AND pn.nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
+          ${buildSchemaQuery('t.table_schema', schemas)}
+      )
     SELECT
       t.table_schema,
       t.table_name,
@@ -166,13 +182,15 @@ const generateTablesAndFields = async (client: Client, schemas: string[]): Promi
       information_schema.columns c
     JOIN
       information_schema.tables t ON c.table_name = t.table_name AND c.table_schema = t.table_schema
+    JOIN
+      table_positions tp ON tp.table_name = t.table_name AND tp.table_schema = t.table_schema
     WHERE
       t.table_type = 'BASE TABLE'
       AND t.table_schema NOT IN ('pg_catalog', 'information_schema')
       ${buildSchemaQuery('t.table_schema', schemas)}
     ORDER BY
       t.table_schema,
-      t.table_name,
+      tp.table_ordinal_position,
       c.ordinal_position
     ;
   `;

package/src/connectors/snowflakeConnector.ts

@@ -212,7 +212,7 @@ const generateTablesAndFields = async (conn: Connection, schemas: string[]): Pro
         ${schemaSql}
     ORDER BY
         c.table_schema,
-        c.table_name,
+        t.created,
         c.ordinal_position;
   `;