@dbml/cli 2.4.3 → 2.5.0

package/__test__/sql2dbml/filename --out-file/expect-out-files/schema.dbml

@@ -11,7 +11,7 @@ Enum "product status" {
 }
 
 Table "orders" {
-  "id" int [pk, increment]
+  "id" SERIAL [pk, increment]
   "user_id" int [unique, not null]
   "status" orders_status
   "created_at" varchar

package/__test__/sql2dbml/filename --out-file/out-files/schema.dbml

@@ -11,7 +11,7 @@ Enum "product status" {
 }
 
 Table "orders" {
-  "id" int [pk, increment]
+  "id" SERIAL [pk, increment]
   "user_id" int [unique, not null]
   "status" orders_status
   "created_at" varchar

package/__test__/sql2dbml/filename --postgres --out-file/expect-out-files/schema.dbml

@@ -11,7 +11,7 @@ Enum "product status" {
 }
 
 Table "orders" {
-  "id" int [pk, increment]
+  "id" SERIAL [pk, increment]
   "user_id" int [unique, not null]
   "status" orders_status
   "created_at" varchar

package/__test__/sql2dbml/filename --postgres --out-file/out-files/schema.dbml

@@ -11,7 +11,7 @@ Enum "product status" {
 }
 
 Table "orders" {
-  "id" int [pk, increment]
+  "id" SERIAL [pk, increment]
   "user_id" int [unique, not null]
   "status" orders_status
   "created_at" varchar

package/__test__/sql2dbml/filename --postgres stdout/stdout.txt

@@ -11,7 +11,7 @@ Enum "product status" {
 }
 
 Table "orders" {
-  "id" int [pk, increment]
+  "id" SERIAL [pk, increment]
   "user_id" int [unique, not null]
   "status" orders_status
   "created_at" varchar

package/__test__/sql2dbml/filename stdout/stdout.txt

@@ -11,7 +11,7 @@ Enum "product status" {
 }
 
 Table "orders" {
-  "id" int [pk, increment]
+  "id" SERIAL [pk, increment]
   "user_id" int [unique, not null]
   "status" orders_status
   "created_at" varchar

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

@@ -0,0 +1,52 @@
+2022-07-13T08:31:21.074Z
+SyntaxError: You have a syntax error at "multiple_schema.in.sql".
+    at /Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/src/cli/utils.js:42:13
+    at Array.forEach (<anonymous>)
+    at generate (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/src/cli/utils.js:36:14)
+    at importHandler (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/src/cli/import.js:28:7)
+    at sql2dbml (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/src/cli/index.js:35:3)
+    at Object.<anonymous> (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/__test__/sql2dbml_bin.js:5:1)
+    at Module._compile (internal/modules/cjs/loader.js:1158:30)
+    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1178:10)
+    at Module.load (internal/modules/cjs/loader.js:1002:32)
+    at Function.Module._load (internal/modules/cjs/loader.js:901:14)
+
+ROOT_ERROR:
+TypeError: Cannot read property 'forEach' of null
+    at Endpoint.setFields (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/node_modules/@dbml/core/lib/model_structure/endpoint.js:143:18)
+    at new Endpoint (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/node_modules/@dbml/core/lib/model_structure/endpoint.js:81:11)
+    at /Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/node_modules/@dbml/core/lib/model_structure/ref.js:99:31
+    at Array.forEach (<anonymous>)
+    at Ref.processEndpoints (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/node_modules/@dbml/core/lib/model_structure/ref.js:98:20)
+    at new Ref (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/node_modules/@dbml/core/lib/model_structure/ref.js:83:11)
+    at /Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/node_modules/@dbml/core/lib/model_structure/database.js:173:28
+    at Array.forEach (<anonymous>)
+    at Database.processSchemaElements (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/node_modules/@dbml/core/lib/model_structure/database.js:143:16)
+    at new Database (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/node_modules/@dbml/core/lib/model_structure/database.js:99:11)
+
+2022-07-14T05:00:39.132Z
+SyntaxError: You have a syntax error at "multiple_schema.in.sql".
+    at /Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/src/cli/utils.js:42:13
+    at Array.forEach (<anonymous>)
+    at generate (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/src/cli/utils.js:36:14)
+    at importHandler (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/src/cli/import.js:28:7)
+    at sql2dbml (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/src/cli/index.js:35:3)
+    at Object.<anonymous> (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-cli/__test__/sql2dbml_bin.js:5:1)
+    at Module._compile (internal/modules/cjs/loader.js:1158:30)
+    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1178:10)
+    at Module.load (internal/modules/cjs/loader.js:1002:32)
+    at Function.Module._load (internal/modules/cjs/loader.js:901:14)
+
+ROOT_ERROR:
+TypeError: Cannot read property 'forEach' of null
+    at Endpoint.setFields (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-core/lib/model_structure/endpoint.js:179:18)
+    at new Endpoint (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-core/lib/model_structure/endpoint.js:93:11)
+    at /Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-core/lib/model_structure/ref.js:99:31
+    at Array.forEach (<anonymous>)
+    at Ref.processEndpoints (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-core/lib/model_structure/ref.js:98:20)
+    at new Ref (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-core/lib/model_structure/ref.js:83:11)
+    at /Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-core/lib/model_structure/database.js:173:28
+    at Array.forEach (<anonymous>)
+    at Database.processSchemaElements (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-core/lib/model_structure/database.js:143:16)
+    at new Database (/Users/nguyenhoang/Documents/workspace/dbx/dbml/packages/dbml-core/lib/model_structure/database.js:99:11)
+

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

@@ -17,9 +17,16 @@ Table "users" {
   "pjs2" job_status
   "pg" schemaB.gender
   "pg2" gender
+  "country_code" int
   Note: 'Sample note on table users'
 }
 
+Table "countries" {
+  "code" int [pk]
+  "name" varchar
+  "continent_name" varchar
+}
+
 Table "products" {
   "id" int [pk]
   "name" varchar [note: 'Product name of table products in public schema']
@@ -29,16 +36,40 @@ Indexes {
 }
 }
 
-Ref:"schemaA"."locations"."id" < "schemaA"."products"."lid"
+Table "booking_reference" {
+  "reference_id" NVARCHAR(10) [not null]
+  "cust_id" NUMBER(10) [not null]
+  "status" NVARCHAR(1) [not null]
+
+Indexes {
+  (reference_id, cust_id) [pk]
+}
+}
+
+Table "br_flight" {
+  "reference_id" NVARCHAR(10) [not null]
+  "cust_id" NUMBER(10) [not null]
+  "flight_id" NVARCHAR(10) [not null]
+
+Indexes {
+  (reference_id, flight_id) [pk]
+}
+}
+
+Ref "fk_1":"schemaA"."locations"."id" < "schemaA"."products"."lid"
 
 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"
 
+Ref "fk_composite":"booking_reference".("reference_id", "cust_id") < "br_flight".("reference_id", "cust_id")
+
+Ref "fk_country_code":"countries"."code" < "users"."country_code"
+
 Enum "schemaB"."gender" {
   "male"
   "female"