@dbml/cli 3.0.0 → 3.1.1

package/__test__/sql2dbml/filenames --mysql stdout/stdout.txt

@@ -34,7 +34,7 @@ Table "rental" {
   "rental_date" datetime
   "inventory_id" int
   "customer_id" int
-  "return_date" ddatetime
+  "return_date" datetime
   "staff_id" int
   "last_update" timestamp
 }

package/__test__/sql2dbml/multiple_schema_mysql/expect-out-files/multiple_schema.out.dbml

@@ -22,30 +22,6 @@ Enum "users_pg2_enum" {
   "female2"
 }
 
-Enum "ecommerce_users_ejs_enum" {
-  "created2"
-  "running2"
-  "done2"
-  "failure2"
-}
-
-Enum "ecommerce_users_ejs2_enum" {
-  "created2"
-  "running2"
-  "done2"
-  "failure2"
-}
-
-Enum "ecommerce_users_eg_enum" {
-  "male"
-  "female"
-}
-
-Enum "ecommerce_users_eg2_enum" {
-  "male2"
-  "female2"
-}
-
 Table "users" {
   "id" int [pk]
   "name" varchar(255)
@@ -58,32 +34,94 @@ Table "users" {
 Table "products" {
   "id" int [pk]
   "name" varchar(255) [note: 'Product name']
-  Note: 'Notes about products table'
+}
+
+Table "orders" {
+  "id1" int
+  "id2" int
+  "pid" int
+  "name" varchar(255)
+  "name2" varchar(255)
+
+Indexes {
+  (id1, id2) [pk, type: hash, name: "CPK_1"]
+  (name, name2) [type: btree, unique, name: "I_UNIQUE_1"]
+  (id1, id2) [type: hash, name: "INDEX_2"]
+}
+  Note: 'this is table orders'
+}
+
+Table "orders2" {
+  "id1" int
+  "id2" int
+  "pid" int
+
+Indexes {
+  (id1, id2) [pk, name: "testCPK"]
+}
+}
+
+Table "orders4" {
+  "id1" int
+  "id2" int
+
+Indexes {
+  (id1, id2) [pk, name: "PK_orders4_id1_id2"]
+}
 }
 
 Ref "FK_1":"schemaA"."locations"."id" < "schemaA"."products"."lid" [delete: cascade]
 
+Ref:"schemaA"."products"."id" < "orders"."pid"
+
+Ref:"schemaA"."products"."id" < "orders2"."pid"
+
+Ref "CFK_1":"orders".("id1", "id2") < "orders2".("id1", "id2") [update: set null, delete: cascade]
+
 Ref:"users"."id" < "ecommerce"."users"."id"
 
-Ref:"users"."name" < "ecommerce"."users"."id"
+Ref "name_optional":"users"."name" < "ecommerce"."users"."id"
 
 Ref:"ecommerce"."users"."id" < "schemaA"."products"."name"
 
 Ref:"users"."id" < "schemaA"."locations"."name"
 
+Enum "ecommerce"."users_ejs_enum" {
+  "created2"
+  "running2"
+  "done2"
+  "failure2"
+}
+
+Enum "ecommerce"."users_ejs2_enum" {
+  "created2"
+  "running2"
+  "done2"
+  "failure2"
+}
+
+Enum "ecommerce"."users_eg_enum" {
+  "male"
+  "female"
+}
+
+Enum "ecommerce"."users_eg2_enum" {
+  "male2"
+  "female2"
+}
+
 Table "ecommerce"."users" {
   "id" int [pk]
   "name" varchar(255)
-  "ejs" ecommerce_users_ejs_enum
-  "ejs2" ecommerce_users_ejs2_enum
-  "eg" ecommerce_users_eg_enum
-  "eg2" ecommerce_users_eg2_enum
-  Note: 'Table users of schema ecommerce'
+  "ejs" ecommerce.users_ejs_enum
+  "ejs2" ecommerce.users_ejs2_enum
+  "eg" ecommerce.users_eg_enum
+  "eg2" ecommerce.users_eg2_enum
 }
 
 Table "schemaA"."products" {
   "id" int [pk]
-  "name" varchar(255)
+  "name" varchar(255) [note: 'Sample field comment on multiples schema']
   "lid" int
 }
 
@@ -91,3 +129,8 @@ Table "schemaA"."locations" {
   "id" int [pk]
   "name" varchar(255)
 }
+
+Table "schemaB"."orders3" {
+  "id1" int [pk]
+  "id2" int
+}

package/__test__/sql2dbml/multiple_schema_mysql/in-files/multiple_schema.in.sql

@@ -16,7 +16,7 @@ CREATE TABLE `users` (
 CREATE TABLE `products` (
   `id` int PRIMARY KEY,
   `name` varchar(255) COMMENT 'Product name'
-) COMMENT = 'Notes about products table';
+);
 
 CREATE TABLE `ecommerce`.`users` (
   `id` int PRIMARY KEY,
@@ -25,11 +25,11 @@ CREATE TABLE `ecommerce`.`users` (
   `ejs2` ENUM ('created2', 'running2', 'done2', 'failure2'),
   `eg` ENUM ('male', 'female'),
   `eg2` ENUM ('male2', 'female2')
-) COMMENT = 'Table users of schema ecommerce';
+);
 
 CREATE TABLE `schemaA`.`products` (
   `id` int PRIMARY KEY,
-  `name` varchar(255),
+  `name` varchar(255) COMMENT 'Sample field comment on multiples schema',
   `lid` int,
   CONSTRAINT `FK_1` FOREIGN KEY (`lid`) REFERENCES `schemaA`.`locations` (`id`) ON DELETE CASCADE
 );
@@ -39,6 +39,39 @@ CREATE TABLE `schemaA`.`locations` (
   `name` varchar(255)
 );
 
+CREATE TABLE `orders` (
+  `id1` int,
+  `id2` int,
+  `pid` int REFERENCES `schemaA`.`products`(id),
+  `name` varchar(255),
+  `name2` varchar(255),
+  CONSTRAINT `CPK_1` PRIMARY KEY testtest USING HASH (`id1`, id2),
+  CONSTRAINT `I_UNIQUE_1` UNIQUE KEY testtest2 USING BTREE (name, `name2`),
+  KEY `INDEX_2` USING HASH (id1, id2)
+) COMMENT "this is table orders";
+
+CREATE TABLE `orders2` (
+  `id1` int,
+  `id2` int,
+  `pid` int REFERENCES `schemaA`.`products`(id),
+  CONSTRAINT PRIMARY KEY testCPK (`id1`, id2),
+  CONSTRAINT `CFK_1` FOREIGN KEY (`id1`, id2) REFERENCES orders (id1, `id2`) ON UPDATE SET NULL ON DELETE CASCADE
+);
+
+CREATE TABLE schemaB.`orders3` (
+  id1 int,
+  id2 int
+);
+
+ALTER TABLE `schemaB`.orders3 ADD PRIMARY KEY (id1);
+
+CREATE TABLE `orders4` (
+  id1 int,
+  `id2` int
+);
+
+ALTER TABLE orders4 ADD CONSTRAINT `PK_orders4_id1_id2` PRIMARY KEY (id1, id2);
+
 ALTER TABLE `ecommerce`.`users` ADD FOREIGN KEY (`id`) REFERENCES `users` (`id`);
 
 ALTER TABLE `ecommerce`.`users` ADD CONSTRAINT `name_optional` FOREIGN KEY (`id`) REFERENCES `users` (`name`);

package/__test__/sql2dbml/multiple_schema_mysql/out-files/multiple_schema.out.dbml

@@ -22,30 +22,6 @@ Enum "users_pg2_enum" {
   "female2"
 }
 
-Enum "ecommerce_users_ejs_enum" {
-  "created2"
-  "running2"
-  "done2"
-  "failure2"
-}
-
-Enum "ecommerce_users_ejs2_enum" {
-  "created2"
-  "running2"
-  "done2"
-  "failure2"
-}
-
-Enum "ecommerce_users_eg_enum" {
-  "male"
-  "female"
-}
-
-Enum "ecommerce_users_eg2_enum" {
-  "male2"
-  "female2"
-}
-
 Table "users" {
   "id" int [pk]
   "name" varchar(255)
@@ -58,32 +34,94 @@ Table "users" {
 Table "products" {
   "id" int [pk]
   "name" varchar(255) [note: 'Product name']
-  Note: 'Notes about products table'
+}
+
+Table "orders" {
+  "id1" int
+  "id2" int
+  "pid" int
+  "name" varchar(255)
+  "name2" varchar(255)
+
+Indexes {
+  (id1, id2) [pk, type: hash, name: "CPK_1"]
+  (name, name2) [type: btree, unique, name: "I_UNIQUE_1"]
+  (id1, id2) [type: hash, name: "INDEX_2"]
+}
+  Note: 'this is table orders'
+}
+
+Table "orders2" {
+  "id1" int
+  "id2" int
+  "pid" int
+
+Indexes {
+  (id1, id2) [pk, name: "testCPK"]
+}
+}
+
+Table "orders4" {
+  "id1" int
+  "id2" int
+
+Indexes {
+  (id1, id2) [pk, name: "PK_orders4_id1_id2"]
+}
 }
 
 Ref "FK_1":"schemaA"."locations"."id" < "schemaA"."products"."lid" [delete: cascade]
 
+Ref:"schemaA"."products"."id" < "orders"."pid"
+
+Ref:"schemaA"."products"."id" < "orders2"."pid"
+
+Ref "CFK_1":"orders".("id1", "id2") < "orders2".("id1", "id2") [update: set null, delete: cascade]
+
 Ref:"users"."id" < "ecommerce"."users"."id"
 
-Ref:"users"."name" < "ecommerce"."users"."id"
+Ref "name_optional":"users"."name" < "ecommerce"."users"."id"
 
 Ref:"ecommerce"."users"."id" < "schemaA"."products"."name"
 
 Ref:"users"."id" < "schemaA"."locations"."name"
 
+Enum "ecommerce"."users_ejs_enum" {
+  "created2"
+  "running2"
+  "done2"
+  "failure2"
+}
+
+Enum "ecommerce"."users_ejs2_enum" {
+  "created2"
+  "running2"
+  "done2"
+  "failure2"
+}
+
+Enum "ecommerce"."users_eg_enum" {
+  "male"
+  "female"
+}
+
+Enum "ecommerce"."users_eg2_enum" {
+  "male2"
+  "female2"
+}
+
 Table "ecommerce"."users" {
   "id" int [pk]
   "name" varchar(255)
-  "ejs" ecommerce_users_ejs_enum
-  "ejs2" ecommerce_users_ejs2_enum
-  "eg" ecommerce_users_eg_enum
-  "eg2" ecommerce_users_eg2_enum
-  Note: 'Table users of schema ecommerce'
+  "ejs" ecommerce.users_ejs_enum
+  "ejs2" ecommerce.users_ejs2_enum
+  "eg" ecommerce.users_eg_enum
+  "eg2" ecommerce.users_eg2_enum
 }
 
 Table "schemaA"."products" {
   "id" int [pk]
-  "name" varchar(255)
+  "name" varchar(255) [note: 'Sample field comment on multiples schema']
   "lid" int
 }
 
@@ -91,3 +129,8 @@ Table "schemaA"."locations" {
   "id" int [pk]
   "name" varchar(255)
 }
+
+Table "schemaB"."orders3" {
+  "id1" int [pk]
+  "id2" int
+}

package/__test__/sql2dbml/multiple_schema_pg/dbml-error.log

@@ -129,3 +129,55 @@ SyntaxError: Expected space but "." found.
     at importHandler (C:\Users\Inspiron101\Desktop\Holistics\dbml\packages\dbml-cli\src\cli\import.js:28:7)
 {"start":{"offset":1227,"line":67,"column":39},"end":{"offset":1228,"line":67,"column":40}}
 
+2023-12-26T12:09:25.581Z
+SyntaxError: You have a syntax error at "multiple_schema.in.sql".
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:48:13
+    at Array.forEach (<anonymous>)
+    at generate (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:39:14)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:27:27)
+    at Object.sql2dbml (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\index.js:27:23)
+    at Object.<anonymous> (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\bin\sql2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1155:14)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)
+    at Module.load (node:internal/modules/cjs/loader:1033:32)
+    at Function.Module._load (node:internal/modules/cjs/loader:868:12)
+
+ROOT_ERROR:
+TypeError: Cannot read properties of undefined (reading 'reportAttemptingFullContext')
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\node_modules\antlr4\dist\antlr4.node.cjs:1:42818
+    at Array.map (<anonymous>)
+    at vt.reportAttemptingFullContext (C:\Users\rikim\Desktop\Holistics\dbx\dbml\node_modules\antlr4\dist\antlr4.node.cjs:1:42808)
+    at se.reportAttemptingFullContext (C:\Users\rikim\Desktop\Holistics\dbx\dbml\node_modules\antlr4\dist\antlr4.node.cjs:1:82908)
+    at se.execATN (C:\Users\rikim\Desktop\Holistics\dbx\dbml\node_modules\antlr4\dist\antlr4.node.cjs:1:68929)
+    at se.adaptivePredict (C:\Users\rikim\Desktop\Holistics\dbx\dbml\node_modules\antlr4\dist\antlr4.node.cjs:1:67715)
+    at PostgreSQLParser.opt_type_modifiers (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1146777)
+    at PostgreSQLParser.generictype (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1146255)
+    at PostgreSQLParser.simpletypename (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1139174)
+    at PostgreSQLParser.typename (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1136757)
+
+2023-12-26T12:13:43.717Z
+SyntaxError: You have a syntax error at "multiple_schema.in.sql".
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:48:13
+    at Array.forEach (<anonymous>)
+    at generate (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\utils.js:39:14)
+    at importHandler (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\import.js:27:27)
+    at Object.sql2dbml (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\lib\cli\index.js:27:23)
+    at Object.<anonymous> (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-cli\bin\sql2dbml.js:4:19)
+    at Module._compile (node:internal/modules/cjs/loader:1155:14)
+    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1209:10)
+    at Module.load (node:internal/modules/cjs/loader:1033:32)
+    at Function.Module._load (node:internal/modules/cjs/loader:868:12)
+
+ROOT_ERROR:
+TypeError: Cannot read properties of undefined (reading 'reportAttemptingFullContext')
+    at C:\Users\rikim\Desktop\Holistics\dbx\dbml\node_modules\antlr4\dist\antlr4.node.cjs:1:42818
+    at Array.map (<anonymous>)
+    at vt.reportAttemptingFullContext (C:\Users\rikim\Desktop\Holistics\dbx\dbml\node_modules\antlr4\dist\antlr4.node.cjs:1:42808)
+    at se.reportAttemptingFullContext (C:\Users\rikim\Desktop\Holistics\dbx\dbml\node_modules\antlr4\dist\antlr4.node.cjs:1:82908)
+    at se.execATN (C:\Users\rikim\Desktop\Holistics\dbx\dbml\node_modules\antlr4\dist\antlr4.node.cjs:1:68929)
+    at se.adaptivePredict (C:\Users\rikim\Desktop\Holistics\dbx\dbml\node_modules\antlr4\dist\antlr4.node.cjs:1:67715)
+    at PostgreSQLParser.opt_type_modifiers (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1146777)
+    at PostgreSQLParser.generictype (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1146255)
+    at PostgreSQLParser.simpletypename (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1139174)
+    at PostgreSQLParser.typename (C:\Users\rikim\Desktop\Holistics\dbx\dbml\packages\dbml-core\lib\parse\ANTLR\parsers\postgresql\PostgreSQLParser.js:3:1136757)
+