@dbml/connector 3.8.0 → 3.9.0

package/__tests__/connector.test.ts

@@ -1,10 +1,10 @@
-import path from 'path';
 import fs from 'fs';
+import path from 'path';
 import { scanDirNames } from '../jestHelpers.ts';
 import { connector } from '../src/index.ts';
 
 describe('@dbml/connector', () => {
-  const runTest = async (dirName) => {
+  const runTest = async (dirName: string) => {
     process.chdir(dirName);
 
     const connectionRaw = fs.readFileSync(path.join(dirName, './connection.json'), 'utf-8');

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

@@ -1,5 +1,19 @@
 {
   "tables": [
+    {
+      "name": "table1",
+      "schemaName": "dbml_test",
+      "note": {
+        "value": ""
+      }
+    },
+    {
+      "name": "table3",
+      "schemaName": "dbml_test",
+      "note": {
+        "value": ""
+      }
+    },
     {
       "name": "all_default_values",
       "schemaName": "public",
@@ -49,6 +63,20 @@
         "value": ""
       }
     },
+    {
+      "name": "table1",
+      "schemaName": "public",
+      "note": {
+        "value": ""
+      }
+    },
+    {
+      "name": "table2",
+      "schemaName": "public",
+      "note": {
+        "value": ""
+      }
+    },
     {
       "name": "table_with_comments",
       "schemaName": "public",
@@ -72,6 +100,62 @@
     }
   ],
   "fields": {
+    "dbml_test.table1": [
+      {
+        "name": "id",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": true,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "status",
+        "type": {
+          "type_name": "enum_type1",
+          "schemaName": "dbml_test"
+        },
+        "dbdefault": null,
+        "not_null": false,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      }
+    ],
+    "dbml_test.table3": [
+      {
+        "name": "id",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": true,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "status",
+        "type": {
+          "type_name": "enum_type3",
+          "schemaName": "dbml_test"
+        },
+        "dbdefault": null,
+        "not_null": false,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      }
+    ],
     "public.all_default_values": [
       {
         "name": "id",
@@ -843,6 +927,62 @@
         }
       }
     ],
+    "public.table1": [
+      {
+        "name": "id",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": true,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "status",
+        "type": {
+          "type_name": "enum_type1",
+          "schemaName": "public"
+        },
+        "dbdefault": null,
+        "not_null": false,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      }
+    ],
+    "public.table2": [
+      {
+        "name": "id",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": true,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "status",
+        "type": {
+          "type_name": "enum_type2",
+          "schemaName": "public"
+        },
+        "dbdefault": null,
+        "not_null": false,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      }
+    ],
     "public.table_with_comments": [
       {
         "name": "id",
@@ -1229,6 +1369,54 @@
     }
   ],
   "enums": [
+    {
+      "name": "enum_type1",
+      "schemaName": "dbml_test",
+      "values": [
+        {
+          "name": "value1"
+        },
+        {
+          "name": "value2"
+        }
+      ]
+    },
+    {
+      "name": "enum_type3",
+      "schemaName": "dbml_test",
+      "values": [
+        {
+          "name": "value4"
+        },
+        {
+          "name": "value5"
+        }
+      ]
+    },
+    {
+      "name": "enum_type1",
+      "schemaName": "public",
+      "values": [
+        {
+          "name": "value1"
+        },
+        {
+          "name": "value2"
+        }
+      ]
+    },
+    {
+      "name": "enum_type2",
+      "schemaName": "public",
+      "values": [
+        {
+          "name": "value1"
+        },
+        {
+          "name": "value3"
+        }
+      ]
+    },
     {
       "name": "gender_type",
       "schemaName": "public",
@@ -1386,6 +1574,26 @@
         "pk": true
       }
     },
+    "public.table1": {
+      "id": {
+        "pk": true
+      }
+    },
+    "dbml_test.table1": {
+      "id": {
+        "pk": true
+      }
+    },
+    "public.table2": {
+      "id": {
+        "pk": true
+      }
+    },
+    "dbml_test.table3": {
+      "id": {
+        "pk": true
+      }
+    },
     "public.table_with_comments": {
       "id": {
         "pk": true

package/dist/connectors/mssqlConnector.d.ts

@@ -1,3 +1,3 @@
 import { DatabaseSchema } from './types';
 declare const fetchSchemaJson: (connection: string) => Promise<DatabaseSchema>;
-export { fetchSchemaJson, };
+export { fetchSchemaJson };

package/dist/connectors/mssqlConnector.js

@@ -106,71 +106,99 @@ const generateTablesFieldsAndEnums = async (client, schemas) => {
     const fields = {};
     const enums = [];
     const tablesAndFieldsSql = `
-  WITH tables_and_fields AS (
+    WITH tables_and_fields AS (
+      SELECT
+        s.name AS table_schema,
+        t.name AS table_name,
+        c.name AS column_name,
+        ty.name AS data_type,
+        c.max_length AS character_maximum_length,
+        c.precision AS numeric_precision,
+        c.scale AS numeric_scale,
+        c.is_identity AS identity_increment,
+        CASE
+          WHEN c.is_nullable = 1 THEN 'YES'
+          ELSE 'NO'
+        END AS is_nullable,
+        CASE
+          WHEN c.default_object_id = 0 THEN NULL
+          ELSE OBJECT_DEFINITION(c.default_object_id)
+        END AS column_default,
+        -- Fetching table comments
+        p.value AS table_comment,
+        ep.value AS column_comment
+      FROM
+        sys.tables t
+        JOIN sys.schemas s ON t.schema_id = s.schema_id
+        JOIN sys.columns c ON t.object_id = c.object_id
+        JOIN sys.types ty ON c.user_type_id = ty.user_type_id
+        LEFT JOIN sys.extended_properties p ON p.major_id = t.object_id
+          AND p.name = 'MS_Description'
+          AND p.minor_id = 0 -- Ensure minor_id is 0 for table comments
+        LEFT JOIN sys.extended_properties ep ON ep.major_id = c.object_id
+          AND ep.minor_id = c.column_id
+          AND ep.name = 'MS_Description'
+      WHERE
+        t.type = 'U' -- User-defined tables
+    ),
+    constraints_with_nulls AS (
+      SELECT
+        tf.*,
+        cc.name AS check_constraint_name,
+        CASE
+          WHEN cc.definition LIKE '%[' + tf.column_name + ']%=''%' THEN cc.definition
+          ELSE NULL
+        END AS check_constraint_definition
+      FROM
+        tables_and_fields AS tf
+      LEFT JOIN sys.check_constraints cc
+        ON cc.parent_object_id = OBJECT_ID(tf.table_schema + '.' + tf.table_name)
+        AND cc.definition LIKE '%' + tf.column_name + '%' -- Ensure the constraint references the column
+    ),
+    constraints_with_row_number AS (
+      SELECT
+        *,
+        ROW_NUMBER() OVER (
+          PARTITION BY table_schema, table_name, column_name
+          ORDER BY
+            CASE
+              WHEN check_constraint_definition IS NOT NULL THEN 1
+              ELSE 2
+            END,
+            check_constraint_name
+        ) AS rn
+      FROM
+        constraints_with_nulls
+    )
     SELECT
-      s.name AS table_schema,
-      t.name AS table_name,
-      c.name AS column_name,
-      ty.name AS data_type,
-      c.max_length AS character_maximum_length,
-      c.precision AS numeric_precision,
-      c.scale AS numeric_scale,
-      c.is_identity AS identity_increment,
+      table_schema,
+      table_name,
+      column_name,
+      data_type,
+      character_maximum_length,
+      numeric_precision,
+      numeric_scale,
+      identity_increment,
+      is_nullable,
+      column_default,
+      table_comment,
+      column_comment,
+      check_constraint_name,
+      check_constraint_definition,
       CASE
-        WHEN c.is_nullable = 1 THEN 'YES'
-        ELSE 'NO'
-      END AS is_nullable,
-      CASE
-        WHEN c.default_object_id = 0 THEN NULL
-        ELSE OBJECT_DEFINITION(c.default_object_id)
-      END AS column_default,
-      -- Fetching table comments
-      p.value AS table_comment,
-      ep.value AS column_comment
+        WHEN column_default LIKE '((%))' THEN 'number'
+        WHEN column_default LIKE '(''%'')' THEN 'string'
+        ELSE 'expression'
+      END AS default_type
     FROM
-      sys.tables t
-      JOIN sys.schemas s ON t.schema_id = s.schema_id
-      JOIN sys.columns c ON t.object_id = c.object_id
-      JOIN sys.types ty ON c.user_type_id = ty.user_type_id
-      LEFT JOIN sys.extended_properties p ON p.major_id = t.object_id
-        AND p.name = 'MS_Description'
-        AND p.minor_id = 0 -- Ensure minor_id is 0 for table comments
-      LEFT JOIN sys.extended_properties ep ON ep.major_id = c.object_id
-        AND ep.minor_id = c.column_id
-        AND ep.name = 'MS_Description'
+      constraints_with_row_number
     WHERE
-      t.type = 'U' -- User-defined tables
-  )
-  SELECT
-    tf.table_schema,
-    tf.table_name,
-    tf.column_name,
-    tf.data_type,
-    tf.character_maximum_length,
-    tf.numeric_precision,
-    tf.numeric_scale,
-    tf.identity_increment,
-    tf.is_nullable,
-    tf.column_default,
-    tf.table_comment,
-    tf.column_comment,
-    cc.name AS check_constraint_name, -- Adding CHECK constraint name
-    cc.definition AS check_constraint_definition, -- Adding CHECK constraint definition
-    CASE
-      WHEN tf.column_default LIKE '((%))' THEN 'number'
-      WHEN tf.column_default LIKE '(''%'')' THEN 'string'
-      ELSE 'expression'
-    END AS default_type
-  FROM
-    tables_and_fields AS tf
-  LEFT JOIN sys.check_constraints cc
-    ON cc.parent_object_id = OBJECT_ID(tf.table_schema + '.' + tf.table_name)
-    AND cc.definition LIKE '%' + tf.column_name + '%' -- Ensure the constraint references the column
-  ${(0, parseSchema_1.buildSchemaQuery)('tf.table_schema', schemas, 'WHERE')}
-  ORDER BY
-    tf.table_schema,
-    tf.table_name,
-    tf.column_name;
+      rn = 1
+      ${(0, parseSchema_1.buildSchemaQuery)('table_schema', schemas, 'WHERE')}
+    ORDER BY
+      table_schema,
+      table_name,
+      column_name;
   `;
     const tablesAndFieldsResult = await client.query(tablesAndFieldsSql);
     const tables = tablesAndFieldsResult.recordset.reduce((acc, row) => {

package/dist/connectors/postgresConnector.d.ts

@@ -1,3 +1,3 @@
 import { DatabaseSchema } from './types';
 declare const fetchSchemaJson: (connection: string) => Promise<DatabaseSchema>;
-export { fetchSchemaJson, };
+export { fetchSchemaJson };

package/dist/connectors/postgresConnector.js

@@ -83,7 +83,7 @@ const generateTablesAndFields = async (client, schemas) => {
     const fields = {};
     const tablesAndFieldsSql = `
     WITH comments AS (
-      SELECT
+      SELECT DISTINCT ON (pc.relname, pn.nspname, pa.attname)
         pc.relname AS table_name,
         pn.nspname AS table_schema,
         pa.attname AS column_name,
@@ -113,6 +113,7 @@ const generateTablesAndFields = async (client, schemas) => {
       c.identity_increment,
       c.is_nullable,
       c.column_default,
+      c.ordinal_position,
       CASE
         WHEN c.column_default IS NULL THEN NULL
         WHEN c.column_default LIKE 'nextval(%' THEN 'increment'
@@ -121,8 +122,8 @@ const generateTablesAndFields = async (client, schemas) => {
         WHEN c.column_default ~ '^-?[0-9]+(.[0-9]+)?$' THEN 'number'
         ELSE 'expression'
       END AS default_type,
-      (SELECT description FROM comments WHERE table_name = t.table_name AND table_schema = t.table_schema AND column_name IS NULL) AS table_comment,
-      (SELECT description FROM comments WHERE table_name = t.table_name AND table_schema = t.table_schema AND column_name = c.column_name) AS column_comment
+      (SELECT description FROM comments WHERE table_name = t.table_name AND table_schema = t.table_schema AND column_name IS NULL LIMIT 1) AS table_comment,
+      (SELECT description FROM comments WHERE table_name = t.table_name AND table_schema = t.table_schema AND column_name = c.column_name LIMIT 1) AS column_comment
     FROM
       information_schema.columns c
     JOIN
@@ -355,7 +356,7 @@ const generateIndexes = async (client, schemas) => {
 };
 const generateRawEnums = async (client, schemas) => {
     const enumListSql = `
-    SELECT
+    SELECT DISTINCT
       n.nspname AS schema_name,
       t.typname AS enum_type,
       e.enumlabel AS enum_value,
@@ -376,14 +377,15 @@ const generateRawEnums = async (client, schemas) => {
     const enumListResult = await client.query(enumListSql);
     const enums = enumListResult.rows.reduce((acc, row) => {
         const { schema_name, enum_type, enum_value } = row;
-        if (!acc[enum_type]) {
-            acc[enum_type] = {
+        const key = `${schema_name}.${enum_type}`;
+        if (!acc[key]) {
+            acc[key] = {
                 name: enum_type,
                 schemaName: schema_name,
                 values: [],
             };
         }
-        acc[enum_type].values.push({
+        acc[key].values.push({
             name: enum_value,
         });
         return acc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/connector",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "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": "f106540bc455695c8a4c91ed63aa8fabc8ce645a"
+  "gitHead": "d40aaa3827853d17fa385aa27ae1e099c9234e4b"
 }

package/src/connectors/mssqlConnector.ts

@@ -1,20 +1,20 @@
 /* eslint-disable camelcase */
 import sql from 'mssql';
+import { buildSchemaQuery, parseConnectionString } from '../utils/parseSchema';
 import {
-  Field,
+  DatabaseSchema,
+  DefaultInfo,
   DefaultType,
-  FieldsDictionary,
   Enum,
+  EnumValue,
+  Field,
+  FieldsDictionary,
+  IndexesDictionary,
   Ref,
   RefEndpoint,
   Table,
-  IndexesDictionary,
-  EnumValue,
   TableConstraintsDictionary,
-  DatabaseSchema,
-  DefaultInfo,
 } from './types';
-import { buildSchemaQuery, parseConnectionString } from '../utils/parseSchema';
 
 const MSSQL_DATE_TYPES = [
   'date',
@@ -141,71 +141,99 @@ const generateTablesFieldsAndEnums = async (client: sql.ConnectionPool, schemas:
   const fields: FieldsDictionary = {};
   const enums: Enum[] = [];
   const tablesAndFieldsSql = `
-  WITH tables_and_fields AS (
+    WITH tables_and_fields AS (
+      SELECT
+        s.name AS table_schema,
+        t.name AS table_name,
+        c.name AS column_name,
+        ty.name AS data_type,
+        c.max_length AS character_maximum_length,
+        c.precision AS numeric_precision,
+        c.scale AS numeric_scale,
+        c.is_identity AS identity_increment,
+        CASE
+          WHEN c.is_nullable = 1 THEN 'YES'
+          ELSE 'NO'
+        END AS is_nullable,
+        CASE
+          WHEN c.default_object_id = 0 THEN NULL
+          ELSE OBJECT_DEFINITION(c.default_object_id)
+        END AS column_default,
+        -- Fetching table comments
+        p.value AS table_comment,
+        ep.value AS column_comment
+      FROM
+        sys.tables t
+        JOIN sys.schemas s ON t.schema_id = s.schema_id
+        JOIN sys.columns c ON t.object_id = c.object_id
+        JOIN sys.types ty ON c.user_type_id = ty.user_type_id
+        LEFT JOIN sys.extended_properties p ON p.major_id = t.object_id
+          AND p.name = 'MS_Description'
+          AND p.minor_id = 0 -- Ensure minor_id is 0 for table comments
+        LEFT JOIN sys.extended_properties ep ON ep.major_id = c.object_id
+          AND ep.minor_id = c.column_id
+          AND ep.name = 'MS_Description'
+      WHERE
+        t.type = 'U' -- User-defined tables
+    ),
+    constraints_with_nulls AS (
+      SELECT
+        tf.*,
+        cc.name AS check_constraint_name,
+        CASE
+          WHEN cc.definition LIKE '%[' + tf.column_name + ']%=''%' THEN cc.definition
+          ELSE NULL
+        END AS check_constraint_definition
+      FROM
+        tables_and_fields AS tf
+      LEFT JOIN sys.check_constraints cc
+        ON cc.parent_object_id = OBJECT_ID(tf.table_schema + '.' + tf.table_name)
+        AND cc.definition LIKE '%' + tf.column_name + '%' -- Ensure the constraint references the column
+    ),
+    constraints_with_row_number AS (
+      SELECT
+        *,
+        ROW_NUMBER() OVER (
+          PARTITION BY table_schema, table_name, column_name
+          ORDER BY
+            CASE
+              WHEN check_constraint_definition IS NOT NULL THEN 1
+              ELSE 2
+            END,
+            check_constraint_name
+        ) AS rn
+      FROM
+        constraints_with_nulls
+    )
     SELECT
-      s.name AS table_schema,
-      t.name AS table_name,
-      c.name AS column_name,
-      ty.name AS data_type,
-      c.max_length AS character_maximum_length,
-      c.precision AS numeric_precision,
-      c.scale AS numeric_scale,
-      c.is_identity AS identity_increment,
-      CASE
-        WHEN c.is_nullable = 1 THEN 'YES'
-        ELSE 'NO'
-      END AS is_nullable,
+      table_schema,
+      table_name,
+      column_name,
+      data_type,
+      character_maximum_length,
+      numeric_precision,
+      numeric_scale,
+      identity_increment,
+      is_nullable,
+      column_default,
+      table_comment,
+      column_comment,
+      check_constraint_name,
+      check_constraint_definition,
       CASE
-        WHEN c.default_object_id = 0 THEN NULL
-        ELSE OBJECT_DEFINITION(c.default_object_id)
-      END AS column_default,
-      -- Fetching table comments
-      p.value AS table_comment,
-      ep.value AS column_comment
+        WHEN column_default LIKE '((%))' THEN 'number'
+        WHEN column_default LIKE '(''%'')' THEN 'string'
+        ELSE 'expression'
+      END AS default_type
     FROM
-      sys.tables t
-      JOIN sys.schemas s ON t.schema_id = s.schema_id
-      JOIN sys.columns c ON t.object_id = c.object_id
-      JOIN sys.types ty ON c.user_type_id = ty.user_type_id
-      LEFT JOIN sys.extended_properties p ON p.major_id = t.object_id
-        AND p.name = 'MS_Description'
-        AND p.minor_id = 0 -- Ensure minor_id is 0 for table comments
-      LEFT JOIN sys.extended_properties ep ON ep.major_id = c.object_id
-        AND ep.minor_id = c.column_id
-        AND ep.name = 'MS_Description'
+      constraints_with_row_number
     WHERE
-      t.type = 'U' -- User-defined tables
-  )
-  SELECT
-    tf.table_schema,
-    tf.table_name,
-    tf.column_name,
-    tf.data_type,
-    tf.character_maximum_length,
-    tf.numeric_precision,
-    tf.numeric_scale,
-    tf.identity_increment,
-    tf.is_nullable,
-    tf.column_default,
-    tf.table_comment,
-    tf.column_comment,
-    cc.name AS check_constraint_name, -- Adding CHECK constraint name
-    cc.definition AS check_constraint_definition, -- Adding CHECK constraint definition
-    CASE
-      WHEN tf.column_default LIKE '((%))' THEN 'number'
-      WHEN tf.column_default LIKE '(''%'')' THEN 'string'
-      ELSE 'expression'
-    END AS default_type
-  FROM
-    tables_and_fields AS tf
-  LEFT JOIN sys.check_constraints cc
-    ON cc.parent_object_id = OBJECT_ID(tf.table_schema + '.' + tf.table_name)
-    AND cc.definition LIKE '%' + tf.column_name + '%' -- Ensure the constraint references the column
-  ${buildSchemaQuery('tf.table_schema', schemas, 'WHERE')}
-  ORDER BY
-    tf.table_schema,
-    tf.table_name,
-    tf.column_name;
+      rn = 1
+      ${buildSchemaQuery('table_schema', schemas, 'WHERE')}
+    ORDER BY
+      table_schema,
+      table_name,
+      column_name;
   `;
 
   const tablesAndFieldsResult = await client.query(tablesAndFieldsSql);
@@ -521,5 +549,5 @@ const fetchSchemaJson = async (connection: string): Promise<DatabaseSchema> => {
 };
 
 export {
-  fetchSchemaJson,
+  fetchSchemaJson
 };

package/src/connectors/postgresConnector.ts

@@ -1,5 +1,6 @@
 /* eslint-disable camelcase */
 import { Client } from 'pg';
+import { buildSchemaQuery, parseConnectionString } from '../utils/parseSchema';
 import {
   DatabaseSchema,
   DefaultInfo,
@@ -13,7 +14,6 @@ import {
   Table,
   TableConstraintsDictionary,
 } from './types';
-import { parseConnectionString, buildSchemaQuery } from '../utils/parseSchema';
 
 const getValidatedClient = async (connection: string): Promise<Client> => {
   const client = new Client(connection);
@@ -121,7 +121,7 @@ const generateTablesAndFields = async (client: Client, schemas: string[]): Promi
   const fields: FieldsDictionary = {};
   const tablesAndFieldsSql = `
     WITH comments AS (
-      SELECT
+      SELECT DISTINCT ON (pc.relname, pn.nspname, pa.attname)
         pc.relname AS table_name,
         pn.nspname AS table_schema,
         pa.attname AS column_name,
@@ -151,6 +151,7 @@ const generateTablesAndFields = async (client: Client, schemas: string[]): Promi
       c.identity_increment,
       c.is_nullable,
       c.column_default,
+      c.ordinal_position,
       CASE
         WHEN c.column_default IS NULL THEN NULL
         WHEN c.column_default LIKE 'nextval(%' THEN 'increment'
@@ -159,8 +160,8 @@ const generateTablesAndFields = async (client: Client, schemas: string[]): Promi
         WHEN c.column_default ~ '^-?[0-9]+(.[0-9]+)?$' THEN 'number'
         ELSE 'expression'
       END AS default_type,
-      (SELECT description FROM comments WHERE table_name = t.table_name AND table_schema = t.table_schema AND column_name IS NULL) AS table_comment,
-      (SELECT description FROM comments WHERE table_name = t.table_name AND table_schema = t.table_schema AND column_name = c.column_name) AS column_comment
+      (SELECT description FROM comments WHERE table_name = t.table_name AND table_schema = t.table_schema AND column_name IS NULL LIMIT 1) AS table_comment,
+      (SELECT description FROM comments WHERE table_name = t.table_name AND table_schema = t.table_schema AND column_name = c.column_name LIMIT 1) AS column_comment
     FROM
       information_schema.columns c
     JOIN
@@ -433,7 +434,7 @@ const generateIndexes = async (client: Client, schemas: string[]) => {
 
 const generateRawEnums = async (client: Client, schemas: string[]): Promise<Enum[]> => {
   const enumListSql = `
-    SELECT
+    SELECT DISTINCT
       n.nspname AS schema_name,
       t.typname AS enum_type,
       e.enumlabel AS enum_value,
@@ -454,15 +455,16 @@ const generateRawEnums = async (client: Client, schemas: string[]): Promise<Enum
   const enumListResult = await client.query(enumListSql);
   const enums = enumListResult.rows.reduce((acc, row) => {
     const { schema_name, enum_type, enum_value } = row;
+    const key = `${schema_name}.${enum_type}`;
 
-    if (!acc[enum_type]) {
-      acc[enum_type] = {
+    if (!acc[key]) {
+      acc[key] = {
         name: enum_type,
         schemaName: schema_name,
         values: [],
       };
     }
-    acc[enum_type].values.push({
+    acc[key].values.push({
       name: enum_value,
     });
     return acc;
@@ -504,5 +506,5 @@ const fetchSchemaJson = async (connection: string): Promise<DatabaseSchema> => {
 };
 
 export {
-  fetchSchemaJson,
+  fetchSchemaJson
 };