@dbml/cli 3.8.1 → 3.9.1

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

@@ -504,3 +504,78 @@ Error: TypeError: Cannot read properties of undefined (reading 'map')
     at Module._load (node:internal/modules/cjs/loader:960:12)
     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
 
+2024-09-17T09:47:11.077Z
+ConnectionError: Failed to connect to localhost:1433 - Could not connect (sequence)
+    at /Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
+    at Connection.onConnect (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
+    at Object.onceWrapper (node:events:629:26)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at Connection.socketError (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1351:12)
+    at /Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1144:14
+    at process.processTicksAndRejections (node:internal/process/task_queues:77:11)
+
+2024-09-17T09:48:11.126Z
+ConnectionError: Failed to connect to localhost:1433 - Could not connect (sequence)
+    at /Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
+    at Connection.onConnect (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
+    at Object.onceWrapper (node:events:629:26)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at Connection.socketError (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1351:12)
+    at /Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1144:14
+    at process.processTicksAndRejections (node:internal/process/task_queues:77:11)
+
+2024-09-17T09:55:00.973Z
+ConnectionError: Failed to connect to localhost:1433 - Could not connect (sequence)
+    at /Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
+    at Connection.onConnect (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
+    at Object.onceWrapper (node:events:629:26)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at Connection.socketError (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1351:12)
+    at /Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1144:14
+    at process.processTicksAndRejections (node:internal/process/task_queues:77:11)
+
+2024-09-17T10:02:34.883Z
+ConnectionError: Failed to connect to localhost:1433 - Could not connect (sequence)
+    at /Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
+    at Connection.onConnect (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
+    at Object.onceWrapper (node:events:629:26)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at Connection.socketError (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1351:12)
+    at /Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1144:14
+    at process.processTicksAndRejections (node:internal/process/task_queues:77:11)
+
+2024-09-17T10:13:24.584Z
+ConnectionError: Failed to connect to localhost:1433 - Could not connect (sequence)
+    at /Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
+    at Connection.onConnect (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
+    at Object.onceWrapper (node:events:629:26)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at Connection.socketError (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1351:12)
+    at /Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1144:14
+    at process.processTicksAndRejections (node:internal/process/task_queues:77:11)
+
+2024-09-18T03:57:41.668Z
+ConnectionError: Login failed for user 'sa'.
+    at /Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
+    at Connection.onConnect (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
+    at Object.onceWrapper (node:events:629:26)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at /Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:2363:18
+    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
+
+2024-09-19T03:57:47.536Z
+ConnectionError: Login failed for user 'sa'.
+    at /Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
+    at Connection.onConnect (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
+    at Object.onceWrapper (node:events:635:26)
+    at Connection.emit (node:events:520:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at /Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:2363:18
+    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
+

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

@@ -13,18 +13,18 @@ Enum "dbo"."chk_gender" {
 }
 
 Table "dbo"."Authors" {
-  "AuthorID" int [pk, not null]
-  "AuthorName" nvarchar [unique]
-  "BirthYear" int [unique]
-  "NationalityID" int [pk, not null]
+  "AuthorID" int(10) [pk, not null]
+  "AuthorName" nvarchar(100) [unique]
+  "BirthYear" int(10) [unique]
+  "NationalityID" int(10) [pk, not null]
 }
 
 Table "dbo"."Books" {
-  "AuthorID" int [pk, not null]
-  "BookID" int [pk, not null]
-  "ISBN" nvarchar [unique]
-  "NationalityID" int
-  "Title" nvarchar
+  "AuthorID" int(10) [pk, not null]
+  "BookID" int(10) [pk, not null]
+  "ISBN" nvarchar(20) [unique]
+  "NationalityID" int(10)
+  "Title" nvarchar(200)
 }
 
 Table "dbo"."DatetimeTypes" {
@@ -32,36 +32,49 @@ Table "dbo"."DatetimeTypes" {
   "DATETIME2Col" datetime2 [default: `sysdatetime()`]
   "DATETIMECol" datetime [default: `getdate()`]
   "DATETIMEOFFSETCol" datetimeoffset [default: `sysdatetimeoffset()`]
-  "ID" int [pk, not null, increment]
+  "ID" int(10) [pk, not null, increment]
   "ROWVERSIONCol" timestamp [not null]
   "SMALLDATETIMECol" smalldatetime [default: `getdate()`]
   "TIMECol" time [default: `CONVERT([time],getdate())`]
 }
 
 Table "dbo"."gender_reference" {
-  "value" nvarchar [pk, not null]
+  "value" nvarchar(10) [pk, not null]
 }
 
 Table "dbo"."NumberTypes" {
-  "BIGINTCol" bigint [default: 0]
+  "BIGINTCol" bigint(19) [default: 0]
   "BITCol" bit [default: 0]
   "DECIMALCol" decimal(10,2) [default: 0.00]
-  "FLOATCol" float [default: 0.0]
-  "ID" int [pk, not null, increment]
-  "INTCol" int [default: 0]
+  "FLOATCol" float(53) [default: 0.0]
+  "ID" int(10) [pk, not null, increment]
+  "INTCol" int(10) [default: 0]
   "NUMERICCol" numeric(10,2) [default: 0.00]
-  "REALCol" real [default: 0.0]
-  "SMALLINTCol" smallint [default: 0]
-  "TINYINTCol" tinyint [default: 0]
+  "REALCol" real(24) [default: 0.0]
+  "SMALLINTCol" smallint(5) [default: 0]
+  "TINYINTCol" tinyint(3) [default: 0]
+}
+
+Table "dbo"."NumberTypesNoDefault" {
+  "BIGINTCol" bigint(19)
+  "BITCol" bit
+  "DECIMALCol" decimal(10,2)
+  "FLOATCol" float(53)
+  "ID" int(10) [pk, not null, increment]
+  "INTCol" int(10)
+  "NUMERICCol" numeric(10,2)
+  "REALCol" real(24)
+  "SMALLINTCol" smallint(5)
+  "TINYINTCol" tinyint(3)
 }
 
 Table "dbo"."ObjectTypes" {
-  "BinaryField" binary [default: `0x00`]
-  "Id" int [pk, not null, increment]
+  "BinaryField" binary(50) [default: `0x00`]
+  "Id" int(10) [pk, not null, increment]
   "ImageField" image [default: `0x00`]
-  "JsonField" nvarchar [default: `N'{"defaultKey": "defaultValue", "status": "active", "count": 0}'`]
-  "VarBinaryField" varbinary [default: `0x00`]
-  "VarBinaryMaxField" varbinary [default: `0x00`]
+  "JsonField" nvarchar(MAX) [default: `N'{"defaultKey": "defaultValue", "status": "active", "count": 0}'`]
+  "VarBinaryField" varbinary(50) [default: `0x00`]
+  "VarBinaryMaxField" varbinary(MAX) [default: `0x00`]
   "XmlField" xml [default: '''<Books>
     <Book>
       <Title>The Great Gatsby</Title>
@@ -87,11 +100,11 @@ Table "dbo"."ObjectTypes" {
 }
 
 Table "dbo"."order_items" {
-  "order_id" int [unique, not null]
-  "order_item_id" int [pk, not null, increment]
-  "product_id" int [unique, not null]
-  "quantity" int [not null]
-  "unit_price" decimal [not null]
+  "order_id" int(10) [unique, not null]
+  "order_item_id" int(10) [pk, not null, increment]
+  "product_id" int(10) [unique, not null]
+  "quantity" int(10) [not null]
+  "unit_price" decimal(10,2) [not null]
 
   Indexes {
     (order_id, product_id) [type: nonclustered, name: "idx_order_items_order_product"]
@@ -101,11 +114,11 @@ Table "dbo"."order_items" {
 Table "dbo"."orders" {
   "billing_address" text [not null]
   "order_date" datetime2 [default: `getdate()`]
-  "order_id" int [pk, not null, increment]
+  "order_id" int(10) [pk, not null, increment]
   "shipping_address" text [not null]
   "status" dbo.chk_status [default: 'pending']
-  "total_amount" decimal [not null]
-  "user_id" int [not null]
+  "total_amount" decimal(12,2) [not null]
+  "user_id" int(10) [not null]
 
   Indexes {
     (user_id, order_date) [type: nonclustered, name: "idx_orders_user_date"]
@@ -113,14 +126,14 @@ Table "dbo"."orders" {
 }
 
 Table "dbo"."products" {
-  "category" varchar
+  "category" varchar(50)
   "created_at" datetime2 [default: `getdate()`]
   "description" text
   "is_available" bit [default: 1]
-  "name" varchar [not null]
-  "price" decimal [not null]
-  "product_id" int [pk, not null, increment]
-  "stock_quantity" int [not null, default: 0]
+  "name" varchar(100) [not null]
+  "price" decimal(10,2) [not null]
+  "product_id" int(10) [pk, not null, increment]
+  "stock_quantity" int(10) [not null, default: 0]
   "updated_at" datetime2 [default: `getdate()`]
 
   Indexes {
@@ -130,47 +143,47 @@ Table "dbo"."products" {
 
 Table "dbo"."StringTypes" {
   "CharField" char(10) [default: 'N/A']
-  "Id" int [pk, not null, increment]
-  "NCharField" nchar [default: `N'N/A'`]
+  "Id" int(10) [pk, not null, increment]
+  "NCharField" nchar(10) [default: `N'N/A'`]
   "NTextField" ntext [default: `N'N/A'`]
-  "NVarCharField" nvarchar [default: `N'N/A'`]
-  "NVarCharMaxField" nvarchar [default: `N'N/A'`]
-  "TextField" text(16) [default: 'N/A']
+  "NVarCharField" nvarchar(50) [default: `N'N/A'`]
+  "NVarCharMaxField" nvarchar(MAX) [default: `N'N/A'`]
+  "TextField" text [default: 'N/A']
   "VarcharField" varchar(50) [default: '{"default_key": "default_value"}']
-  "VarcharMaxField" varchar [default: 'N/A']
+  "VarcharMaxField" varchar(MAX) [default: 'N/A']
 }
 
 Table "dbo"."table_with_comments" {
   "created_at" datetime2 [default: `getdate()`, note: 'Timestamp when the item was created.']
-  "description" text [note: 'Detailed description of the item.']
-  "id" int [pk, not null, increment, note: 'Unique identifier for each item.']
-  "name" varchar [note: 'Name of the item.']
+  "description" text [note: '''Item\'s description''']
+  "id" int(10) [pk, not null, increment, note: 'Unique identifier for each item.']
+  "name" varchar(100) [note: 'Name of the item.']
   Note: 'This table stores information about various items.'
 }
 
 Table "dbo"."user_define_data_types" {
-  "age_end" int
-  "age_start" int
+  "age_end" int(10)
+  "age_start" int(10)
   "gender" dbo.chk_gender
-  "height" float
-  "id" int [pk, not null, increment]
-  "name" nvarchar
-  "weight" float
+  "height" float(53)
+  "id" int(10) [pk, not null, increment]
+  "name" nvarchar(50)
+  "weight" float(53)
 }
 
 Table "dbo"."users" {
   "created_at" datetime2 [default: `getdate()`]
   "date_of_birth" date
-  "email" varchar [unique, not null]
-  "first_name" varchar
-  "full_name" varchar
-  "full_name_lower" varchar
+  "email" varchar(100) [unique, not null]
+  "first_name" varchar(50)
+  "full_name" varchar(100)
+  "full_name_lower" varchar(100)
   "is_active" bit [default: 1]
   "last_login" datetime2
-  "last_name" varchar
-  "password_hash" varchar [not null]
-  "user_id" int [pk, not null, increment]
-  "username" varchar [unique, not null]
+  "last_name" varchar(50)
+  "password_hash" varchar(255) [not null]
+  "user_id" int(10) [pk, not null, increment]
+  "username" varchar(50) [unique, not null]
 
   Indexes {
     email [type: nonclustered, name: "idx_users_email"]

package/__test__/db2dbml/mssql/out-files/schema.dbml

@@ -0,0 +1,205 @@
+Enum "dbo"."chk_status" {
+  "cancelled"
+  "delivered"
+  "shipped"
+  "processing"
+  "pending"
+}
+
+Enum "dbo"."chk_gender" {
+  "Other"
+  "Female"
+  "Male"
+}
+
+Table "dbo"."Authors" {
+  "AuthorID" int(10) [pk, not null]
+  "AuthorName" nvarchar(100) [unique]
+  "BirthYear" int(10) [unique]
+  "NationalityID" int(10) [pk, not null]
+}
+
+Table "dbo"."Books" {
+  "AuthorID" int(10) [pk, not null]
+  "BookID" int(10) [pk, not null]
+  "ISBN" nvarchar(20) [unique]
+  "NationalityID" int(10)
+  "Title" nvarchar(200)
+}
+
+Table "dbo"."DatetimeTypes" {
+  "DATECol" date [default: `getdate()`]
+  "DATETIME2Col" datetime2(7) [default: `sysdatetime()`]
+  "DATETIME2Col_2" datetime2(4) [default: `sysdatetime()`]
+  "DATETIMECol" datetime [default: `getdate()`]
+  "DATETIMEOFFSETCol" datetimeoffset(7) [default: `sysdatetimeoffset()`]
+  "DATETIMEOFFSETCol_2" datetimeoffset(4) [default: `sysdatetimeoffset()`]
+  "ID" int(10) [pk, not null, increment]
+  "ROWVERSIONCol" timestamp [not null]
+  "SMALLDATETIMECol" smalldatetime [default: `getdate()`]
+  "TIMECol" time [default: `CONVERT([time],getdate())`]
+}
+
+Table "dbo"."gender_reference" {
+  "value" nvarchar(10) [pk, not null]
+}
+
+Table "dbo"."NumberTypes" {
+  "BIGINTCol" bigint(19) [default: 0]
+  "BITCol" bit [default: 0]
+  "DECIMALCol" decimal(10,2) [default: 0.00]
+  "FLOATCol" float(53) [default: 0.0]
+  "ID" int(10) [pk, not null, increment]
+  "INTCol" int(10) [default: 0]
+  "NUMERICCol" numeric(10,2) [default: 0.00]
+  "REALCol" real(24) [default: 0.0]
+  "SMALLINTCol" smallint(5) [default: 0]
+  "TINYINTCol" tinyint(3) [default: 0]
+}
+
+Table "dbo"."NumberTypesNoDefault" {
+  "BIGINTCol" bigint(19)
+  "BITCol" bit
+  "DECIMALCol" decimal(10,2)
+  "FLOATCol" float(53)
+  "ID" int(10) [pk, not null, increment]
+  "INTCol" int(10)
+  "NUMERICCol" numeric(10,2)
+  "REALCol" real(24)
+  "SMALLINTCol" smallint(5)
+  "TINYINTCol" tinyint(3)
+}
+
+Table "dbo"."ObjectTypes" {
+  "BinaryField" binary(50) [default: `0x00`]
+  "Id" int(10) [pk, not null, increment]
+  "ImageField" image [default: `0x00`]
+  "JsonField" nvarchar(MAX) [default: `N'{"defaultKey": "defaultValue", "status": "active", "count": 0}'`]
+  "VarBinaryField" varbinary(50) [default: `0x00`]
+  "VarBinaryMaxField" varbinary(MAX) [default: `0x00`]
+  "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>''']
+}
+
+Table "dbo"."order_items" {
+  "order_id" int(10) [unique, not null]
+  "order_item_id" int(10) [pk, not null, increment]
+  "product_id" int(10) [unique, not null]
+  "quantity" int(10) [not null]
+  "unit_price" decimal(10,2) [not null]
+
+  Indexes {
+    (order_id, product_id) [type: nonclustered, name: "idx_order_items_order_product"]
+  }
+}
+
+Table "dbo"."orders" {
+  "billing_address" text [not null]
+  "order_date" datetime2(7) [default: `getdate()`]
+  "order_id" int(10) [pk, not null, increment]
+  "shipping_address" text [not null]
+  "status" dbo.chk_status [default: 'pending']
+  "total_amount" decimal(12,2) [not null]
+  "user_id" int(10) [not null]
+
+  Indexes {
+    (user_id, order_date) [type: nonclustered, name: "idx_orders_user_date"]
+  }
+}
+
+Table "dbo"."products" {
+  "category" varchar(50)
+  "created_at" datetime2(7) [default: `getdate()`]
+  "description" text
+  "is_available" bit [default: 1]
+  "name" varchar(100) [not null]
+  "price" decimal(10,2) [not null]
+  "product_id" int(10) [pk, not null, increment]
+  "stock_quantity" int(10) [not null, default: 0]
+  "updated_at" datetime2(7) [default: `getdate()`]
+
+  Indexes {
+    category [type: nonclustered, name: "idx_products_category"]
+  }
+}
+
+Table "dbo"."StringTypes" {
+  "CharField" char(10) [default: 'N/A']
+  "Id" int(10) [pk, not null, increment]
+  "NCharField" nchar(10) [default: `N'N/A'`]
+  "NTextField" ntext [default: `N'N/A'`]
+  "NVarCharField" nvarchar(50) [default: `N'N/A'`]
+  "NVarCharMaxField" nvarchar(MAX) [default: `N'N/A'`]
+  "TextField" text [default: 'N/A']
+  "VarcharField" varchar(50) [default: '{"default_key": "default_value"}']
+  "VarcharMaxField" varchar(MAX) [default: 'N/A']
+}
+
+Table "dbo"."table_with_comments" {
+  "created_at" datetime2(7) [default: `getdate()`, note: 'Timestamp when the item was created.']
+  "description" text [note: '''Item\'s description''']
+  "id" int(10) [pk, not null, increment, note: 'Unique identifier for each item.']
+  "name" varchar(100) [note: 'Name of the item.']
+  Note: 'This table stores information about various items.'
+}
+
+Table "dbo"."user_define_data_types" {
+  "age_end" int(10)
+  "age_start" int(10)
+  "gender" dbo.chk_gender
+  "height" float(53)
+  "id" int(10) [pk, not null, increment]
+  "name" nvarchar(50)
+  "weight" float(53)
+}
+
+Table "dbo"."users" {
+  "created_at" datetime2(7) [default: `getdate()`]
+  "date_of_birth" date
+  "email" varchar(100) [unique, not null]
+  "first_name" varchar(50)
+  "full_name" varchar(100)
+  "full_name_lower" varchar(100)
+  "is_active" bit [default: 1]
+  "last_login" datetime2(7)
+  "last_name" varchar(50)
+  "password_hash" varchar(255) [not null]
+  "user_id" int(10) [pk, not null, increment]
+  "username" varchar(50) [unique, not null]
+
+  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"]
+  }
+}
+
+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__/db2dbml/mssql/schema.sql

@@ -132,6 +132,20 @@ CREATE TABLE NumberTypes (
 );
 GO
 
+CREATE TABLE NumberTypesNoDefault (
+  ID INT IDENTITY(1,1) PRIMARY KEY,
+  TINYINTCol TINYINT,
+  SMALLINTCol SMALLINT,
+  INTCol INT,
+  BIGINTCol BIGINT,
+  DECIMALCol DECIMAL(10, 2),
+  NUMERICCol NUMERIC(10, 2),
+  FLOATCol FLOAT,
+  REALCol REAL,
+  BITCol BIT
+);
+GO
+
 -- Create a table with default values for date and time types
 CREATE TABLE DatetimeTypes (
   ID INT IDENTITY(1,1) PRIMARY KEY,
@@ -251,7 +265,7 @@ GO
 
 EXEC sys.sp_addextendedproperty
   @name=N'MS_Description',
-  @value=N'Detailed description of the item.',
+  @value=N'Item''s description',
   @level0type=N'SCHEMA',
   @level0name=N'dbo',
   @level1type=N'TABLE',

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

@@ -318,3 +318,84 @@ Error: TypeError: Cannot read properties of undefined (reading 'map')
     at Module._load (node:internal/modules/cjs/loader:960:12)
     at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
 
+2024-09-19T03:57:47.937Z
+undefined
+
+2024-10-10T09:34:04.641Z
+Error: connect ECONNREFUSED ::1:3306
+    at createConnection (/Users/huylm/code/dbx/dbml/node_modules/mysql2/promise.js:253:31)
+    at connectMySQL (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:8:57)
+    at fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:366:26)
+    at Object.fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/connector.js:16:57)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:24:51)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:62:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+
+2024-10-10T09:38:06.539Z
+Error: connect ECONNREFUSED ::1:3306
+    at createConnection (/Users/huylm/code/dbx/dbml/node_modules/mysql2/promise.js:253:31)
+    at connectMySQL (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:8:57)
+    at fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:366:26)
+    at Object.fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/connector.js:16:57)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:24:51)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:62:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+
+2024-10-10T09:39:26.496Z
+Error: connect ECONNREFUSED ::1:3306
+    at createConnection (/Users/huylm/code/dbx/dbml/node_modules/mysql2/promise.js:253:31)
+    at connectMySQL (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:8:57)
+    at fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:366:26)
+    at Object.fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/connector.js:16:57)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:24:51)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:62:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+
+2024-10-10T09:43:10.585Z
+Error: connect ECONNREFUSED ::1:3306
+    at createConnection (/Users/huylm/code/dbx/dbml/node_modules/mysql2/promise.js:253:31)
+    at connectMySQL (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:8:57)
+    at fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:366:26)
+    at Object.fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/connector.js:16:57)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:24:51)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:62:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+
+2024-10-10T09:43:40.861Z
+Error: connect ECONNREFUSED ::1:3306
+    at createConnection (/Users/huylm/code/dbx/dbml/node_modules/mysql2/promise.js:253:31)
+    at connectMySQL (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:8:57)
+    at fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:366:26)
+    at Object.fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/connector.js:16:57)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:24:51)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:62:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+
+2024-10-11T08:36:12.009Z
+Error: connect ECONNREFUSED ::1:3306
+    at createConnection (/Users/huylm/code/dbx/dbml/node_modules/mysql2/promise.js:253:31)
+    at connectMySQL (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:8:57)
+    at fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/mysqlConnector.js:366:26)
+    at Object.fetchSchemaJson (/Users/huylm/code/dbx/dbml/packages/dbml-connector/dist/connectors/connector.js:16:57)
+    at connectionHandler (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/connector.js:24:51)
+    at Object.db2dbml (/Users/huylm/code/dbx/dbml/packages/dbml-cli/lib/cli/index.js:62:26)
+    at Object.<anonymous> (/Users/huylm/code/dbx/dbml/packages/dbml-cli/bin/db2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1256:14)
+    at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
+    at Module.load (node:internal/modules/cjs/loader:1119:32)
+

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

@@ -98,8 +98,8 @@ Table "default_example" {
 
 Table "hash_index_example" {
   "id" int [pk, not null, note: 'unique identifier for each record']
-  "name" varchar(100) [note: 'first name of the individual']
-  "name1" varchar(100) [note: 'last name of the individual']
+  "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"]

package/__test__/db2dbml/mysql/out-files/schema.dbml

@@ -98,8 +98,8 @@ Table "default_example" {
 
 Table "hash_index_example" {
   "id" int [pk, not null, note: 'unique identifier for each record']
-  "name" varchar(100) [note: 'first name of the individual']
-  "name1" varchar(100) [note: 'last name of the individual']
+  "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"]

package/__test__/db2dbml/mysql/schema.sql

@@ -124,8 +124,8 @@ create unique index idx_email_unique on index_example (email);
 -- comments & hash index
 create table hash_index_example (
   id int primary key comment 'unique identifier for each record',
-  name varchar(100) comment 'first name of the individual',
-  name1 varchar(100) comment 'last name of the individual',
+  name varchar(100) comment 'first name''s of the individual',
+  name1 varchar(100) comment 'last name''s of the individual',
   index idx_name_name1 (name, name1) using hash comment 'hash index for fast lookups on name and name1'
 ) engine=memory comment='table for storing names with a hash index';
 

package/__test__/db2dbml/postgres/expect-out-files/schema.dbml

@@ -136,10 +136,10 @@ Table "table2" {
 
 Table "table_with_comments" {
   "id" int4 [pk, not null, increment, note: 'Unique identifier for each item.']
-  "name" varchar(100) [note: 'Name of the item.']
-  "description" text [note: 'Detailed description of the item.']
+  "name" varchar(100) [note: '''Item\'s name.''']
+  "description" text [note: '''Item\'s description''']
   "created_at" timestamptz [default: `CURRENT_TIMESTAMP`, note: 'Timestamp when the item was created.']
-  Note: 'This table stores information about various items.'
+  Note: '''This table stores information about various items. Such as: \'id\', \'name\', \'description\''''
 }
 
 Table "user_define_data_types" {

package/__test__/db2dbml/postgres/out-files/schema.dbml

@@ -1,3 +1,33 @@
+Enum "dbml_test"."enum_type1" {
+  "value1"
+  "value2"
+}
+
+Enum "dbml_test"."enum_type3" {
+  "value4"
+  "value5"
+}
+
+Table "dbml_test"."table1" {
+  "id" int4 [pk, not null, increment]
+  "status" dbml_test.enum_type1
+}
+
+Table "dbml_test"."table3" {
+  "id" int4 [pk, not null, increment]
+  "status" dbml_test.enum_type3
+}
+
+Enum "enum_type1" {
+  "value1"
+  "value2"
+}
+
+Enum "enum_type2" {
+  "value1"
+  "value3"
+}
+
 Enum "gender_type" {
   "Male"
   "Female"
@@ -94,12 +124,22 @@ Table "products" {
   }
 }
 
+Table "table1" {
+  "id" int4 [pk, not null, increment]
+  "status" enum_type1
+}
+
+Table "table2" {
+  "id" int4 [pk, not null, increment]
+  "status" enum_type2
+}
+
 Table "table_with_comments" {
   "id" int4 [pk, not null, increment, note: 'Unique identifier for each item.']
-  "name" varchar(100) [note: 'Name of the item.']
-  "description" text [note: 'Detailed description of the item.']
+  "name" varchar(100) [note: '''Item\'s name.''']
+  "description" text [note: '''Item\'s description''']
   "created_at" timestamptz [default: `CURRENT_TIMESTAMP`, note: 'Timestamp when the item was created.']
-  Note: 'This table stores information about various items.'
+  Note: '''This table stores information about various items. Such as: \'id\', \'name\', \'description\''''
 }
 
 Table "user_define_data_types" {
@@ -138,3 +178,8 @@ Ref "fk_order":"orders"."order_id" < "order_items"."order_id" [delete: cascade]
 Ref "fk_product":"products"."product_id" < "order_items"."product_id" [delete: cascade]
 
 Ref "fk_user":"users"."user_id" < "orders"."user_id" [delete: cascade]
+
+Table "test"."employee" {
+  "employeeid" int8 [not null]
+  "identifier" test.test.citext
+}

package/__test__/db2dbml/postgres/schema.sql

@@ -130,10 +130,10 @@ CREATE TABLE table_with_comments (
 );
 
 -- Add comments
-COMMENT ON TABLE table_with_comments IS 'This table stores information about various items.';
+COMMENT ON TABLE table_with_comments IS 'This table stores information about various items. Such as: ''id'', ''name'', ''description''';
 COMMENT ON COLUMN table_with_comments.id IS 'Unique identifier for each item.';
-COMMENT ON COLUMN table_with_comments.name IS 'Name of the item.';
-COMMENT ON COLUMN table_with_comments.description IS 'Detailed description of the item.';
+COMMENT ON COLUMN table_with_comments.name IS 'Item''s name.';
+COMMENT ON COLUMN table_with_comments.description IS 'Item''s description';
 COMMENT ON COLUMN table_with_comments.created_at IS 'Timestamp when the item was created.';
 
 -- Create Authors table

package/dbml-error.log

@@ -139,3 +139,63 @@ Error: Test throw
     at Module.load (node:internal/modules/cjs/loader:1119:32)
     at Module._load (node:internal/modules/cjs/loader:960:12)
 
+2024-09-17T09:27:49.220Z
+ConnectionError: Failed to connect to localhost:1433 - Could not connect (sequence)
+    at /Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
+    at Connection.onConnect (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
+    at Object.onceWrapper (node:events:629:26)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at Connection.socketError (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1351:12)
+    at /Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:1144:14
+    at process.processTicksAndRejections (node:internal/process/task_queues:77:11)
+
+2024-10-10T09:44:57.755Z
+ConnectionError: Login failed for user 'sa'.
+    at /Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/connection-pool.js:85:17
+    at Connection.onConnect (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:849:9)
+    at Object.onceWrapper (node:events:629:26)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at /Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:2363:18
+    at process.processTicksAndRejections (node:internal/process/task_queues:95:5)
+
+2024-10-10T09:45:34.357Z
+RequestError: Incorrect syntax near the keyword 'WHERE'.
+    at handleError (/Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/request.js:384:15)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at RequestTokenHandler.onErrorMessage (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/token/handler.js:284:21)
+    at Readable.<anonymous> (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/token/token-stream-parser.js:19:33)
+    at Readable.emit (node:events:514:28)
+    at addChunk (node:internal/streams/readable:324:12)
+    at readableAddChunk (node:internal/streams/readable:297:9)
+    at Readable.push (node:internal/streams/readable:234:10)
+    at next (node:internal/streams/from:98:31)
+
+2024-10-10T09:46:21.137Z
+RequestError: Incorrect syntax near the keyword 'WHERE'.
+    at handleError (/Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/request.js:384:15)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at RequestTokenHandler.onErrorMessage (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/token/handler.js:284:21)
+    at Readable.<anonymous> (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/token/token-stream-parser.js:19:33)
+    at Readable.emit (node:events:514:28)
+    at addChunk (node:internal/streams/readable:324:12)
+    at readableAddChunk (node:internal/streams/readable:297:9)
+    at Readable.push (node:internal/streams/readable:234:10)
+    at next (node:internal/streams/from:98:31)
+
+2024-10-10T09:49:37.872Z
+RequestError: Incorrect syntax near the keyword 'WHERE'.
+    at handleError (/Users/huylm/code/dbx/dbml/node_modules/mssql/lib/tedious/request.js:384:15)
+    at Connection.emit (node:events:514:28)
+    at Connection.emit (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/connection.js:970:18)
+    at RequestTokenHandler.onErrorMessage (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/token/handler.js:284:21)
+    at Readable.<anonymous> (/Users/huylm/code/dbx/dbml/node_modules/tedious/lib/token/token-stream-parser.js:19:33)
+    at Readable.emit (node:events:514:28)
+    at addChunk (node:internal/streams/readable:324:12)
+    at readableAddChunk (node:internal/streams/readable:297:9)
+    at Readable.push (node:internal/streams/readable:234:10)
+    at next (node:internal/streams/from:98:31)
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/cli",
-  "version": "3.8.1",
+  "version": "3.9.1",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -26,8 +26,8 @@
   ],
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@dbml/connector": "^3.8.1",
-    "@dbml/core": "^3.8.1",
+    "@dbml/connector": "^3.9.1",
+    "@dbml/core": "^3.9.1",
     "bluebird": "^3.5.5",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
@@ -55,7 +55,7 @@
       "^.+\\.js$": "babel-jest"
     }
   },
-  "gitHead": "40a25ded1488372f082739f6d43e45f2ad918e7e",
+  "gitHead": "8494c278b97347945cf3b71d6f75cd658dbae85d",
   "engines": {
     "node": ">=18"
   }