@dbml/cli 3.13.9-alpha.0 → 3.14.0

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

@@ -1,9 +1,9 @@
 Table "UserMaster" {
-  "UserMasterKey" BIGINT [not null, increment]
+  "UserMasterKey" "BIGINT IDENTITY(1,1)" [not null]
 }
 
 Table "CodeDef" {
-  "CdKey" BIGINT [not null, increment]
+  "CdKey" "BIGINT IDENTITY(1,1)" [not null]
   "Category" NVARCHAR(50) [not null]
   "Description" NVARCHAR(100)
   "Code" NVARCHAR(50) [not null]
@@ -16,7 +16,7 @@ Table "CodeDef" {
   "EffectiveThruDtTm" DATETIMEOFFSET(7)
 
   Indexes {
-    CdKey [pk]
+    CdKey [pk, name: "PK__CodeDef__4922449ECDD244C3"]
   }
 }
 

package/__test__/sql2dbml/multiple_schema_mssql/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" nvarchar(255)
@@ -72,13 +48,37 @@ 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" nvarchar(255)
-  "ejs" ecommerce_users_ejs_enum [not null]
-  "ejs2" ecommerce_users_ejs2_enum [not null]
-  "eg" ecommerce_users_eg_enum [not null]
-  "eg2" ecommerce_users_eg2_enum [not null]
+  "ejs" ecommerce.users_ejs_enum [not null]
+  "ejs2" ecommerce.users_ejs2_enum [not null]
+  "eg" ecommerce.users_eg_enum [not null]
+  "eg2" ecommerce.users_eg2_enum [not null]
 
   Indexes {
     (name, ejs) [name: "idx_1"]

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

@@ -1,52 +0,0 @@
-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)
-