@dbml/cli 5.0.0-alpha.0 → 5.1.0

package/__test__/cli.test.js

@@ -41,17 +41,18 @@ 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');
-  }, 10000);
+  }, timeout);
 
   test.each(scanDirNames(__dirname, 'sql2dbml'))('sql2dbml/%s', async (dirName) => {
     await runTest(path.join(__dirname, 'sql2dbml', dirName), '../bin/sql2dbml.js');
-  }, 10000);
+  }, timeout);
 
   test.each(scanDirNames(__dirname, 'db2dbml'))('db2dbml/%s', async (dirName) => {
     await runTest(path.join(__dirname, 'db2dbml', dirName), '../bin/db2dbml.js');
-  }, 10000);
+  }, timeout);
   /* eslint-enable */
 });

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

@@ -1,48 +1,13 @@
-Enum "dbo"."chk_status_status" {
-  "cancelled"
-  "delivered"
-  "shipped"
-  "processing"
-  "pending"
-}
-
-Enum "dbo"."chk_gender_gender" {
-  "Other"
-  "Female"
-  "Male"
-}
-
-Enum "dbo"."CK_Address_Valid_AddressID_AddressFormatID" {
-  "176029FA-D6D3-49E1-A48C-000000000002"
-  "176029FA-D6D3-49E1-A48C-000000000001"
-}
-
-Enum "dbo"."CK_Address_Valid2_A1" {
-  "333"
-  "2222"
-  "1111"
-}
-
-Enum "dbo"."CK_Address_Valid2_A2_A3" {
-  "2222"
-  "1111"
-}
-
-Enum "dbo"."CK_Address_Valid2_A4" {
-  "3333"
-  "2222"
-}
-
 Table "dbo"."users" {
   "user_id" int(10) [pk, not null, increment]
   "username" varchar(50) [unique, not null]
-  "email" varchar(100) [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
+  "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]
@@ -58,8 +23,8 @@ Table "dbo"."products" {
   "product_id" int(10) [pk, not null, increment]
   "name" varchar(100) [not null]
   "description" text
-  "price" decimal(10,2) [not null]
-  "stock_quantity" int(10) [not null, default: 0]
+  "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()`]
@@ -74,8 +39,8 @@ 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]
-  "status" dbo.chk_status_status [default: 'pending']
+  "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]
 
@@ -88,8 +53,8 @@ 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]
-  "unit_price" decimal(10,2) [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"]
@@ -183,11 +148,15 @@ Table "dbo"."gender_reference" {
 Table "dbo"."user_define_data_types" {
   "id" int(10) [pk, not null, increment]
   "name" nvarchar(50)
-  "gender" dbo.chk_gender_gender
+  "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" {
@@ -214,20 +183,28 @@ Table "dbo"."Books" {
 }
 
 Table "dbo"."AddressInfo" {
-  "AddressID" dbo.CK_Address_Valid_AddressID_AddressFormatID [not null]
-  "AddressFormatID" dbo.CK_Address_Valid_AddressID_AddressFormatID [not null]
+  "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" dbo.CK_Address_Valid2_A1 [not null]
-  "A2" dbo.CK_Address_Valid2_A2_A3 [not null]
-  "A3" dbo.CK_Address_Valid2_A2_A3 [not null]
-  "A4" dbo.CK_Address_Valid2_A4 [not null]
+  "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) [note: 'Name of the entity.']
+  "Name" nvarchar(100) [check: `len([Name])>(6)`, note: 'Name of the entity.']
   Note: 'This is the custom comment name on table.'
 }
 

package/__test__/db2dbml/mssql/schema.sql

@@ -336,7 +336,7 @@ GO
 
 CREATE TABLE TestDescriptionTable (
   Id INT,
-  Name NVARCHAR(100)
+  Name NVARCHAR(100) CONSTRAINT chk_name_len CHECK (LEN(Name) > 6)
 );
 
 EXEC sp_addextendedproperty
@@ -358,3 +358,4 @@ EXEC sp_addextendedproperty
 @level0type = N'SCHEMA', @level0name = 'dbo',
 @level1type = N'TABLE',  @level1name = 'TestDescriptionTable',
 @level2type = N'COLUMN', @level2name = 'Name';
+GO

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

@@ -136,9 +136,13 @@ Table "orders" {
 Table "products" {
   "id" "int unsigned" [pk, not null, increment]
   "price" decimal(10,2) [not null]
-  "quantity" int [not null]
-  "total_value" "decimal(10,2) GENERATED ALWAYS AS ((`price` * `quantity`)) STORED"
+  "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" {
@@ -169,6 +173,10 @@ Table "users" {
   "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")

package/__test__/db2dbml/mysql/schema.sql

@@ -9,15 +9,21 @@ create table users (
   date_of_birth date,
   created_at timestamp default current_timestamp,
   last_login timestamp default now(),
-  is_active tinyint(1) default 1
+  is_active tinyint(1) default 1,
+
+  constraint chk_last_login
+  check (created_at <= last_login)
 );
 
 create table products (
   id int unsigned primary key auto_increment,
-  price decimal(10,2) not null,
+  price decimal(10,2) not null check (price > 0 AND price < 1000000),
   quantity int not null,
   total_value decimal(10,2) generated always as ((price * quantity)) stored,
-  updated_at timestamp default current_timestamp on update current_timestamp
+  updated_at timestamp default current_timestamp on update current_timestamp,
+  
+  constraint max_quantity check (quantity < 10000),
+  check (total_value > 0)
 );
 
 create table orders (

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

@@ -37,12 +37,12 @@ Enum "gender_type" {
 Table "users" {
   "user_id" int4 [pk, not null, increment]
   "username" varchar(50) [unique, not null]
-  "email" varchar(100) [unique, not null]
+  "email" varchar(100) [unique, not null, check: `(email)::text ~* '^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}$'::text`]
   "password_hash" varchar(255) [not null]
   "first_name" varchar(50)
   "last_name" varchar(50)
   "full_name" varchar(100)
-  "date_of_birth" date
+  "date_of_birth" date [check: `date_of_birth <= (CURRENT_DATE - '13 years'::interval)`]
   "created_at" timestamptz [default: `CURRENT_TIMESTAMP`]
   "last_login" timestamptz
   "is_active" bool [default: true]
@@ -58,13 +58,17 @@ Table "products" {
   "product_id" int4 [pk, not null, increment]
   "name" varchar(100) [not null]
   "description" text
-  "price" numeric(10,2) [not null]
-  "stock_quantity" int4 [not null, default: 0]
+  "price" numeric(10,2) [not null, check: `price > (0)::numeric`]
+  "stock_quantity" int4 [not null, check: `stock_quantity >= 0`, default: 0]
   "category" varchar(50)
   "created_at" timestamptz [default: `CURRENT_TIMESTAMP`]
   "updated_at" timestamptz [default: `CURRENT_TIMESTAMP`]
   "is_available" bool [default: true]
 
+  Checks {
+    `created_at <= updated_at` [name: 'chk_created_at']
+  }
+
   Indexes {
     category [type: btree, name: "idx_products_category"]
   }
@@ -74,8 +78,8 @@ Table "orders" {
   "order_id" int4 [pk, not null, increment]
   "user_id" int4 [not null]
   "order_date" timestamptz [default: `CURRENT_TIMESTAMP`]
-  "total_amount" numeric(12,2) [not null]
-  "status" varchar(20) [default: 'pending']
+  "total_amount" numeric(12,2) [not null, check: `total_amount > (0)::numeric`]
+  "status" varchar(20) [check: `(status)::text = ANY ((ARRAY['pending'::character varying, 'processing'::character varying, 'shipped'::character varying, 'delivered'::character varying, 'cancelled'::character varying])::text[])`, default: 'pending']
   "shipping_address" text [not null]
   "billing_address" text [not null]
 
@@ -88,8 +92,8 @@ Table "order_items" {
   "order_item_id" int4 [pk, not null, increment]
   "order_id" int4 [not null]
   "product_id" int4 [not null]
-  "quantity" int4 [not null]
-  "unit_price" numeric(10,2) [not null]
+  "quantity" int4 [not null, check: `quantity > 0`]
+  "unit_price" numeric(10,2) [not null, check: `unit_price > (0)::numeric`]
 
   Indexes {
     (order_id, product_id) [type: btree, name: "uq_order_product"]
@@ -130,8 +134,8 @@ Table "user_define_data_types" {
   "name" varchar(50)
   "gender" gender_type
   "age" int4range
-  "height" float8
-  "weight" float8
+  "height" float8 [check: `height > (0)::double precision`]
+  "weight" float8 [check: `weight > (0)::double precision`]
 }
 
 Table "table_with_comments" {

package/__test__/db2dbml/postgres/schema.sql

@@ -38,7 +38,8 @@ CREATE TABLE products (
   updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
   is_available BOOLEAN DEFAULT TRUE,
   CONSTRAINT chk_price_positive CHECK (price > 0),
-  CONSTRAINT chk_stock_non_negative CHECK (stock_quantity >= 0)
+  CONSTRAINT chk_stock_non_negative CHECK (stock_quantity >= 0),
+  CONSTRAINT chk_created_at CHECK (created_at <= updated_at)
 );
 
 -- Create an index on the category column for faster filtering
@@ -117,8 +118,8 @@ CREATE TABLE user_define_data_types (
   name VARCHAR(50),
   gender gender_type,
   age int4range,  -- Using built-in int4range for age range
-  height FLOAT,
-  weight FLOAT
+  height FLOAT CHECK (height > 0),
+  weight FLOAT CONSTRAINT chk_positive_weight CHECK (weight > 0)
 );
 
 -- Create table with comments

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/cli",
-  "version": "5.0.0-alpha.0",
+  "version": "5.1.0",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -26,8 +26,8 @@
   ],
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@dbml/connector": "^5.0.0-alpha.0",
-    "@dbml/core": "^5.0.0-alpha.0",
+    "@dbml/connector": "^5.1.0",
+    "@dbml/core": "^5.1.0",
     "bluebird": "^3.5.5",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
@@ -55,7 +55,7 @@
       "^.+\\.js$": "babel-jest"
     }
   },
-  "gitHead": "630548187910efa893579e80ab07f447df1ef61e",
+  "gitHead": "376dca507512a3fe549f630e6f22d7d339939183",
   "engines": {
     "node": ">=18"
   }