@dbml/cli 5.1.0 → 5.2.0

package/.babelrc

@@ -12,8 +12,8 @@
   "env": {
     "test": {
       "plugins": [
-        "@babel/plugin-transform-runtime",
+        "@babel/plugin-transform-runtime"
       ]
     }
   }
-}
+}

package/{__test__ → __tests__}/cli.test.js

@@ -23,8 +23,8 @@ describe('@dbml/cli', () => {
     const expectStdout = fs.readFileSync(path.join(dirName, './stdout.txt'), 'utf-8');
     const actualStdout = stripAnsi(stdout);
 
-    // folder name contains `syntax-error`
-    if (path.basename(dirName).includes('syntax-error')) {
+    // folder name contains `error`
+    if (path.basename(dirName).includes('error')) {
       expect(actualStdout).toContain(expectStdout);
     } else {
       expect(actualStdout).toBe(expectStdout);
@@ -42,7 +42,7 @@ describe('@dbml/cli', () => {
   };
 
   const timeout = 100000;
-  /* eslint-disable */
+
   test.each(scanDirNames(__dirname, 'dbml2sql'))('dbml2sql/%s', async (dirName) => {
     await runTest(path.join(__dirname, 'dbml2sql', dirName), '../bin/dbml2sql.js');
   }, timeout);
@@ -54,5 +54,4 @@ describe('@dbml/cli', () => {
   test.each(scanDirNames(__dirname, 'db2dbml'))('db2dbml/%s', async (dirName) => {
     await runTest(path.join(__dirname, 'db2dbml', dirName), '../bin/db2dbml.js');
   }, timeout);
-  /* eslint-enable */
 });

package/__tests__/db2dbml/mssql/dbml-error.log

@@ -0,0 +1,11 @@
+2025-11-17T14:38:14.793Z
+ConnectionError: Failed to connect to localhost:1433 - Could not connect (sequence)
+    at /home/huydna/projects/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
+    at Connection.onConnect (/home/huydna/projects/dbml/node_modules/tedious/lib/connection.js:849:9)
+    at Object.onceWrapper (node:events:633:26)
+    at Connection.emit (node:events:518:28)
+    at Connection.emit (/home/huydna/projects/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at Connection.socketError (/home/huydna/projects/dbml/node_modules/tedious/lib/connection.js:1351:12)
+    at /home/huydna/projects/dbml/node_modules/tedious/lib/connection.js:1144:14
+    at process.processTicksAndRejections (node:internal/process/task_queues:85:11)
+

package/__tests__/db2dbml/mssql/expect-out-files/schema.dbml

@@ -0,0 +1,226 @@
+Table "dbo"."users" {
+  "user_id" int(10) [pk, not null, increment]
+  "username" varchar(50) [unique, not null]
+  "email" varchar(100) [unique, not null, check: `[email] like '%_@_%._%'`]
+  "password_hash" varchar(255) [not null]
+  "first_name" varchar(50)
+  "last_name" varchar(50)
+  "full_name" varchar(100)
+  "full_name_lower" varchar(100)
+  "date_of_birth" date [check: `[date_of_birth]<=dateadd(year,(-13),getdate())`]
+  "created_at" datetime2 [default: `getdate()`]
+  "last_login" datetime2
+  "is_active" bit [default: 1]
+
+  Indexes {
+    email [type: nonclustered, name: "idx_users_email"]
+    full_name [type: nonclustered, name: "idx_users_full_name"]
+    (is_active, full_name_lower) [type: nonclustered, name: "idx_users_is_active_full_name"]
+  }
+}
+
+Table "dbo"."products" {
+  "product_id" int(10) [pk, not null, increment]
+  "name" varchar(100) [not null]
+  "description" text
+  "price" decimal(10,2) [not null, check: `[price]>(0)`]
+  "stock_quantity" int(10) [not null, check: `[stock_quantity]>=(0)`, default: 0]
+  "category" varchar(50)
+  "created_at" datetime2 [default: `getdate()`]
+  "updated_at" datetime2 [default: `getdate()`]
+  "is_available" bit [default: 1]
+
+  Indexes {
+    category [type: nonclustered, name: "idx_products_category"]
+  }
+}
+
+Table "dbo"."orders" {
+  "order_id" int(10) [pk, not null, increment]
+  "user_id" int(10) [not null]
+  "order_date" datetime2 [default: `getdate()`]
+  "total_amount" decimal(12,2) [not null, check: `[total_amount]>(0)`]
+  "status" varchar(20) [check: `[status]='cancelled' OR [status]='delivered' OR [status]='shipped' OR [status]='processing' OR [status]='pending'`, default: 'pending']
+  "shipping_address" text [not null]
+  "billing_address" text [not null]
+
+  Indexes {
+    (user_id, order_date) [type: nonclustered, name: "idx_orders_user_date"]
+  }
+}
+
+Table "dbo"."order_items" {
+  "order_item_id" int(10) [pk, not null, increment]
+  "order_id" int(10) [unique, not null]
+  "product_id" int(10) [unique, not null]
+  "quantity" int(10) [not null, check: `[quantity]>(0)`]
+  "unit_price" decimal(10,2) [not null, check: `[unit_price]>(0)`]
+
+  Indexes {
+    (order_id, product_id) [type: nonclustered, name: "idx_order_items_order_product"]
+  }
+}
+
+Table "dbo"."StringTypes" {
+  "Id" int(10) [pk, not null, increment]
+  "CharField" char(10) [default: 'N/A']
+  "VarcharField" varchar(50) [default: '{"default_key": "default_value"}']
+  "VarcharMaxField" varchar(MAX) [default: 'N/A']
+  "TextField" text [default: 'N/A']
+  "NCharField" nchar(10) [default: `N'N/A'`]
+  "NVarCharField" nvarchar(50) [default: `N'N/A'`]
+  "NVarCharMaxField" nvarchar(MAX) [default: `N'N/A'`]
+  "NTextField" ntext [default: `N'N/A'`]
+}
+
+Table "dbo"."NumberTypes" {
+  "ID" int(10) [pk, not null, increment]
+  "TINYINTCol" tinyint(3) [default: 0]
+  "SMALLINTCol" smallint(5) [default: 0]
+  "INTCol" int(10) [default: 0]
+  "BIGINTCol" bigint(19) [default: 0]
+  "DECIMALCol" decimal(10,2) [default: 0.00]
+  "NUMERICCol" numeric(10,2) [default: 0.00]
+  "FLOATCol" float(53) [default: 0.0]
+  "REALCol" real(24) [default: 0.0]
+  "BITCol" bit [default: 0]
+}
+
+Table "dbo"."NumberTypesNoDefault" {
+  "ID" int(10) [pk, not null, increment]
+  "TINYINTCol" tinyint(3)
+  "SMALLINTCol" smallint(5)
+  "INTCol" int(10)
+  "BIGINTCol" bigint(19)
+  "DECIMALCol" decimal(10,2)
+  "NUMERICCol" numeric(10,2)
+  "FLOATCol" float(53)
+  "REALCol" real(24)
+  "BITCol" bit
+}
+
+Table "dbo"."DatetimeTypes" {
+  "ID" int(10) [pk, not null, increment]
+  "DATECol" date [default: `getdate()`]
+  "TIMECol" time [default: `CONVERT([time],getdate())`]
+  "DATETIMECol" datetime [default: `getdate()`]
+  "DATETIME2Col" datetime2 [default: `sysdatetime()`]
+  "SMALLDATETIMECol" smalldatetime [default: `getdate()`]
+  "ROWVERSIONCol" timestamp [not null]
+  "DATETIMEOFFSETCol" datetimeoffset [default: `sysdatetimeoffset()`]
+}
+
+Table "dbo"."ObjectTypes" {
+  "Id" int(10) [pk, not null, increment]
+  "XmlField" xml [default: '''<Books>
+    <Book>
+      <Title>The Great Gatsby</Title>
+      <Author>F. Scott Fitzgerald</Author>
+      <Year>1925</Year>
+      <Price>10.99</Price>
+      <Publisher>Scribner</Publisher>
+      <Location>New York</Location>
+      <Genre>Fiction</Genre>
+      <Subgenre>Classic</Subgenre>
+    </Book>
+    <Book>
+      <Title>1984</Title>
+      <Author>George Orwell</Author>
+      <Year>1949</Year>
+      <Price>8.99</Price>
+      <Publisher>Secker & Warburg</Publisher>
+      <Location>London</Location>
+      <Genre>Dystopian</Genre>
+      <Subgenre>Political Fiction</Subgenre>
+    </Book>
+  </Books>''']
+  "JsonField" nvarchar(MAX) [default: `N'{"defaultKey": "defaultValue", "status": "active", "count": 0}'`]
+  "BinaryField" binary(50) [default: `0x00`]
+  "VarBinaryField" varbinary(50) [default: `0x00`]
+  "VarBinaryMaxField" varbinary(MAX) [default: `0x00`]
+  "ImageField" image [default: `0x00`]
+}
+
+Table "dbo"."gender_reference" {
+  "value" nvarchar(10) [pk, not null]
+}
+
+Table "dbo"."user_define_data_types" {
+  "id" int(10) [pk, not null, increment]
+  "name" nvarchar(50)
+  "gender" nvarchar(10) [check: `[gender]='Other' OR [gender]='Female' OR [gender]='Male'`]
+  "age_start" int(10)
+  "age_end" int(10)
+  "height" float(53)
+  "weight" float(53)
+
+  Checks {
+    `[age_start]<=[age_end]` [name: 'chk_age_range']
+  }
+}
+
+Table "dbo"."table_with_comments" {
+  "id" int(10) [pk, not null, increment, note: 'Unique identifier for each item.']
+  "name" varchar(100) [note: 'Name of the item.']
+  "description" text [note: '''Item\'s description''']
+  "created_at" datetime2 [default: `getdate()`, note: 'Timestamp when the item was created.']
+  Note: 'This table stores information about various items.'
+}
+
+Table "dbo"."table_with_composite_primary_and_unique_indexes" {
+  "col1" int(10) [pk, not null]
+  "col2" int(10) [pk, not null]
+  "col3" int(10) [unique]
+  "col4" int(10) [unique]
+}
+
+Table "dbo"."Authors" {
+  "AuthorID" int(10) [pk, not null]
+  "NationalityID" int(10) [pk, not null]
+  "AuthorName" nvarchar(100) [unique]
+  "BirthYear" int(10) [unique]
+}
+
+Table "dbo"."Books" {
+  "BookID" int(10) [pk, not null]
+  "AuthorID" int(10) [pk, not null]
+  "NationalityID" int(10)
+  "ISBN" nvarchar(20) [unique]
+  "Title" nvarchar(200)
+}
+
+Table "dbo"."AddressInfo" {
+  "AddressID" uniqueidentifier(16) [not null]
+  "AddressFormatID" uniqueidentifier(16) [not null]
+
+  Checks {
+    `([AddressID]='176029FA-D6D3-49E1-A48C-000000000002' OR [AddressID]='176029FA-D6D3-49E1-A48C-000000000001') AND ([AddressFormatID]='176029FA-D6D3-49E1-A48C-000000000002' OR [AddressFormatID]='176029FA-D6D3-49E1-A48C-000000000001')` [name: 'CK_Address_Valid']
+  }
+}
+
+Table "dbo"."AddressInfo2" {
+  "A1" uniqueidentifier(16) [not null]
+  "A2" uniqueidentifier(16) [not null]
+  "A3" uniqueidentifier(16) [not null]
+  "A4" uniqueidentifier(16) [not null]
+
+  Checks {
+    `([A1]='333' OR [A1]='2222' OR [A1]='1111') AND ([A2]='2222' OR [A2]='1111') AND ([A3]='1111' OR [A3]='2222') AND ([A4]='3333' OR [A4]='2222')` [name: 'CK_Address_Valid2']
+  }
+}
+
+Table "dbo"."TestDescriptionTable" {
+  "Id" int(10) [note: 'Primary key identifier.']
+  "Name" nvarchar(100) [check: `len([Name])>(6)`, note: 'Name of the entity.']
+  Note: 'This is the custom comment name on table.'
+}
+
+Ref "FK_AuthorNationality":"dbo"."Authors".("AuthorID", "NationalityID") < "dbo"."Books".("AuthorID", "NationalityID")
+
+Ref "fk_product":"dbo"."products"."product_id" < "dbo"."order_items"."product_id" [update: cascade]
+
+Ref "fk_order":"dbo"."orders"."order_id" < "dbo"."order_items"."order_id" [update: cascade, delete: cascade]
+
+Ref "fk_user":"dbo"."users"."user_id" < "dbo"."orders"."user_id" [update: cascade, delete: cascade]
+
+Ref "fk_gender":"dbo"."gender_reference"."value" < "dbo"."user_define_data_types"."gender"

package/{__test__ → __tests__}/db2dbml/mssql/schema.sql

@@ -230,6 +230,17 @@ CREATE TABLE table_with_comments (
 );
 GO
 
+-- Composite primary and unique indexes
+CREATE TABLE table_with_composite_primary_and_unique_indexes (
+  col1 INT,
+  col2 INT,
+  col3 INT,
+  col4 INT,
+  PRIMARY KEY (col1, col2),
+  UNIQUE (col3, col4)
+);
+GO
+
 -- Add comments
 EXEC sys.sp_addextendedproperty
   @name=N'MS_Description',

package/__tests__/db2dbml/mysql/dbml-error.log

@@ -0,0 +1,3 @@
+2025-11-17T14:38:15.588Z
+undefined
+

package/__tests__/db2dbml/mysql/expect-out-files/schema.dbml

@@ -0,0 +1,200 @@
+Enum "status_example_2_s1_enum" {
+  "active"
+  "inactive"
+  "pending"
+}
+
+Enum "status_example_2_s2_enum" {
+  "active"
+  "inactive"
+  "pending"
+}
+
+Enum "status_example_2_s3_enum" {
+  "active"
+  "inactive"
+  "pending"
+}
+
+Enum "status_example_2_s4_enum" {
+  "active"
+  "inactive"
+  "pending"
+}
+
+Enum "status_example_2_s5_enum" {
+  "0"
+  "1"
+  "2"
+}
+
+Enum "status_example_2_s6_enum" {
+  "0"
+  "1"
+  "2"
+}
+
+Enum "status_example_2_s7_enum" {
+  "0"
+  "1"
+  "2"
+}
+
+Enum "status_example_2_s8_enum" {
+  "0"
+  "1"
+  "2"
+}
+
+Table "categories" {
+  "cat_id" "int unsigned" [pk, not null, increment]
+  "cat_name" varchar(50) [not null]
+  "super_cat_id" "int unsigned"
+  "created_at" timestamp [default: `CURRENT_TIMESTAMP`]
+}
+
+Table "composite_key_1" {
+  "id1_1" "int unsigned" [not null]
+  "id1_2" "int unsigned" [not null]
+  "email" varchar(255)
+  "name" varchar(50)
+
+  Indexes {
+    (id1_1, id1_2) [pk, name: "PRIMARY"]
+    (email, name) [unique, name: "uc_unique_composite"]
+  }
+}
+
+Table "composite_key_2" {
+  "id2_1" "int unsigned" [not null]
+  "id2_2" "int unsigned" [not null]
+
+  Indexes {
+    (id2_1, id2_2) [pk, name: "PRIMARY"]
+  }
+}
+
+Table "date_time_example" {
+  "default_now" timestamp [default: `CURRENT_TIMESTAMP`]
+  "default_local" timestamp [default: `CURRENT_TIMESTAMP`]
+  "date_plus_7_days" date [default: `(curdate() + interval 7 day)`]
+  "date_minus_30_days" date [default: `(curdate() - interval 30 day)`]
+  "timestamp_plus_1_hour" timestamp [default: `(now() + interval 1 hour)`]
+  "timestamp_minus_15_minutes" timestamp [default: `(now() - interval 15 minute)`]
+  "on_update_1" "datetime on update CURRENT_TIMESTAMP" [default: `CURRENT_TIMESTAMP`]
+  "on_update_2" "datetime on update CURRENT_TIMESTAMP" [default: `CURRENT_TIMESTAMP`]
+}
+
+Table "default_example" {
+  "id" int [pk, not null, increment]
+  "column1" varchar(255) [default: `concat(_utf8mb4\'default \',uuid())`]
+  "column2" varchar(255) [default: `concat(_utf8mb4\'random \',floor((rand() * 100)))`]
+  "column3" varchar(255) [default: '_utf8mb4']
+  "column4" double [default: 0.5]
+  "created_date" date [default: `curdate()`]
+  "first_date" date [default: '2023-01-01']
+  "event_time" timestamp [default: '2024-01-01 00:00:00']
+}
+
+Table "hash_index_example" {
+  "id" int [pk, not null, note: 'unique identifier for each record']
+  "name" varchar(100) [note: '''first name\'s of the individual''']
+  "name1" varchar(100) [note: '''last name\'s of the individual''']
+
+  Indexes {
+    (name, name1) [type: hash, name: "idx_name_name1"]
+  }
+  Note: 'table for storing names with a hash index'
+}
+
+Table "index_example" {
+  "id" int [pk, not null, increment]
+  "name_lower" varchar(100) [not null]
+  "name_inline" varchar(100) [not null]
+  "email" varchar(100) [unique, not null]
+  "age" int
+  "city" varchar(50)
+
+  Indexes {
+    (city, age) [type: btree, name: "idx_city_age"]
+    `city(5)` [type: btree, name: "idx_city_part"]
+    name_inline [type: btree, name: "idx_name"]
+    `lower(name_lower)` [type: btree, name: "idx_name_lower"]
+  }
+}
+
+Table "order_items" {
+  "order_id" "int unsigned" [not null]
+  "product_id" "int unsigned" [not null]
+}
+
+Table "orders" {
+  "order_id" "int unsigned" [pk, not null, increment]
+  "user_id" "int unsigned"
+}
+
+Table "products" {
+  "id" "int unsigned" [pk, not null, increment]
+  "price" decimal(10,2) [not null]
+  "quantity" int [not null, check: ``quantity` < 10000`]
+  "total_value" "decimal(10,2) GENERATED ALWAYS AS ((`price` * `quantity`)) STORED" [check: ``total_value` > 0`]
+  "updated_at" "timestamp on update CURRENT_TIMESTAMP" [default: `CURRENT_TIMESTAMP`]
+
+  Checks {
+    `(`price` > 0) and (`price` < 1000000)` [name: 'products_chk_1']
+  }
+}
+
+Table "sqrt_triangle" {
+  "side_a" double
+  "side_b" double
+  "side_c" "double GENERATED ALWAYS AS (sqrt(((`side_a` * `side_a`) + (`side_b` * `side_b`)))) VIRTUAL"
+}
+
+Table "status_example_2" {
+  "s1" status_example_2_s1_enum [not null]
+  "s2" status_example_2_s2_enum
+  "s3" status_example_2_s3_enum [default: 'active']
+  "s4" status_example_2_s4_enum [default: 'pending']
+  "s5" status_example_2_s5_enum
+  "s6" status_example_2_s6_enum [not null]
+  "s7" status_example_2_s7_enum [default: '1']
+  "s8" status_example_2_s8_enum [default: '0']
+}
+
+Table "table_with_composite_primary_and_unique_indexes" {
+  "col1" int [not null]
+  "col2" int [not null]
+  "col3" int
+  "col4" int
+
+  Indexes {
+    (col3, col4) [unique, name: "col3"]
+    (col1, col2) [pk, name: "PRIMARY"]
+  }
+}
+
+Table "users" {
+  "user_id" "int unsigned" [pk, not null, increment]
+  "username" varchar(50) [unique, not null]
+  "email" varchar(100) [unique, not null]
+  "password_hash" varchar(255) [not null]
+  "first_name" varchar(50)
+  "last_name" varchar(50)
+  "date_of_birth" date
+  "created_at" timestamp [default: `CURRENT_TIMESTAMP`]
+  "last_login" timestamp [default: `CURRENT_TIMESTAMP`]
+  "is_active" tinyint(1) [default: 1]
+
+  Checks {
+    ``created_at` <= `last_login`` [name: 'chk_last_login']
+  }
+}
+
+Ref "fk_test_composite":"composite_key_2".("id2_1", "id2_2") < "composite_key_1".("id1_1", "id1_2")
+
+Ref "fk_detail_items_orders":"orders"."order_id" < "order_items"."order_id" [delete: cascade]
+
+Ref "fk_detail_items_products":"products"."id" < "order_items"."product_id"
+
+Ref "fk_order_user":"users"."user_id" < "orders"."user_id" [delete: set null]

package/{__test__ → __tests__}/db2dbml/mysql/schema.sql

@@ -145,3 +145,12 @@ create table date_time_example (
   on_update_1 datetime default now() on update now(),
   on_update_2 datetime default now() on update localtime()
 );
+
+create table table_with_composite_primary_and_unique_indexes (
+  col1 int,
+  col2 int,
+  col3 int,
+  col4 int,
+  primary key (col1, col2),
+  unique (col3, col4)
+);

package/__tests__/db2dbml/postgres/dbml-error.log

@@ -0,0 +1,7 @@
+2025-11-17T14:38:16.383Z
+Error: PostgreSQL connection error: AggregateError
+    at getValidatedClient (/home/huydna/projects/dbml/packages/dbml-connector/dist/connectors/postgresConnector.js:21:19)
+    at process.processTicksAndRejections (node:internal/process/task_queues:105:5)
+    at async fetchSchemaJson (/home/huydna/projects/dbml/packages/dbml-connector/dist/connectors/postgresConnector.js:482:20)
+    at async connectionHandler (/home/huydna/projects/dbml/packages/dbml-cli/lib/cli/connector.js:24:24)
+