@dbml/cli 3.4.1 → 3.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/cli",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@babel/cli": "^7.21.0",
-    "@dbml/core": "^3.4.1",
+    "@dbml/core": "^3.4.2",
     "bluebird": "^3.5.5",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
@@ -53,5 +53,5 @@
       "^.+\\.js$": "babel-jest"
     }
   },
-  "gitHead": "cbec59d485564023f5d2d95e10ad6379cc8d00fb"
+  "gitHead": "69c7433c7460b9840f504bc0b1364acd48a066a9"
 }

package/yarn-error.log

@@ -0,0 +1,87 @@
+Arguments: 
+  /usr/local/bin/node /usr/local/bin/yarn install
+
+PATH: 
+  /opt/homebrew/opt/openjdk/bin:/opt/homebrew/opt/postgresql@13/bin:/Library/Frameworks/Python.framework/Versions/3.11/bin:/Library/Frameworks/Python.framework/Versions/3.10/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin:/opt/homebrew/opt/openjdk/bin:/opt/homebrew/opt/postgresql@13/bin:/Library/Frameworks/Python.framework/Versions/3.11/bin:/Library/Frameworks/Python.framework/Versions/3.10/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/Users/nguyenhoang/.cargo/bin
+
+Yarn version: 
+  1.22.18
+
+Node version: 
+  16.18.0
+
+Platform: 
+  darwin arm64
+
+Trace: 
+  SyntaxError: /Users/nguyenhoang/Documents/workspace/dbx/dbml/package.json: Unexpected token } in JSON at position 130
+      at JSON.parse (<anonymous>)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:1625:59
+      at Generator.next (<anonymous>)
+      at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
+
+npm manifest: 
+  {
+    "name": "@dbml/cli",
+    "version": "2.5.3",
+    "description": "",
+    "main": "lib/index.js",
+    "license": "Apache-2.0",
+    "scripts": {
+      "test": "jest",
+      "build": "babel src --out-dir lib --copy-files",
+      "prepublish": "npm run build"
+    },
+    "publishConfig": {
+      "access": "public"
+    },
+    "bin": {
+      "dbml2sql": "bin/dbml2sql.js",
+      "sql2dbml": "bin/sql2dbml.js"
+    },
+    "author": "Holistics <dev@holistics.io>",
+    "homepage": "https://dbml.dbdiagram.io",
+    "repository": "https://github.com/holistics/dbml/tree/master/packages/dbml-cli",
+    "keywords": [
+      "dbml",
+      "dbml-cli"
+    ],
+    "dependencies": {
+      "@babel/cli": "^7.21.0",
+      "@dbml/core": "^2.5.3",
+      "bluebird": "^3.5.5",
+      "chalk": "^2.4.2",
+      "commander": "^2.20.0",
+      "esm": "^3.2.25",
+      "figures": "^3.2.0",
+      "lodash": "^4.17.15",
+      "pegjs-require-import": "^0.0.2",
+      "strip-ansi": "^5.2.0",
+      "winston": "^3.2.1"
+    },
+    "devDependencies": {
+      "@babel/core": "^7.21.4",
+      "@babel/node": "^7.20.7",
+      "@babel/plugin-transform-runtime": "^7.21.4",
+      "@babel/preset-env": "^7.21.4",
+      "@babel/runtime": "^7.21.0",
+      "babel-jest": "^29.5.0",
+      "jest": "^29.5.0"
+    },
+    "jest": {
+      "setupFiles": [
+        "./jestHelpers.js"
+      ],
+      "transform": {
+        "^.+\\.js$": "babel-jest"
+      }
+    },
+    "gitHead": "5cb80e1aa38fb9a4dbe3079e39c9ef93cd4dc556"
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile

package/__test__/dbml2sql/filename --oracle --out-file/out-files/schema.sql

@@ -1,61 +0,0 @@
--- SQL dump generated using DBML (dbml.dbdiagram.io)
--- Database: Oracle
--- Generated at: 2024-04-15T03:41:56.214Z
-
-CREATE TABLE "orders" (
-  "id" int GENERATED AS IDENTITY PRIMARY KEY,
-  "user_id" int UNIQUE NOT NULL,
-  "status" nvarchar2(255) NOT NULL CHECK ("status" IN ('created', 'running', 'done', 'failure'))
-);
-
-CREATE TABLE "order_items" (
-  "order_id" int,
-  "product_id" int,
-  "quantity" int DEFAULT 1
-);
-
-CREATE TABLE "products" (
-  "id" int PRIMARY KEY,
-  "name" nvarchar2(255),
-  "merchant_id" int NOT NULL,
-  "price" int,
-  "status" nvarchar2(255) NOT NULL CHECK ("status" IN ('Out of Stock', 'In Stock')),
-  "created_at" timestamp DEFAULT current_timestamp
-);
-
-CREATE TABLE "users" (
-  "id" int PRIMARY KEY,
-  "full_name" nvarchar2(255),
-  "email" nvarchar2(255) UNIQUE,
-  "gender" nvarchar2(255),
-  "date_of_birth" date,
-  "created_at" timestamp,
-  "country_code" int
-);
-
-CREATE TABLE "merchants" (
-  "id" int PRIMARY KEY,
-  "merchant_name" nvarchar2(255),
-  "country_code" int,
-  "created_at" timestamp,
-  "admin_id" int
-);
-
-CREATE TABLE "countries" (
-  "code" int PRIMARY KEY,
-  "name" nvarchar2(255)
-);
-
-CREATE INDEX "product_status" ON "products" ("merchant_id", "status");
-
-ALTER TABLE "order_items" ADD FOREIGN KEY ("order_id") REFERENCES "orders" ("id");
-
-ALTER TABLE "order_items" ADD FOREIGN KEY ("product_id") REFERENCES "products" ("id");
-
-ALTER TABLE "users" ADD FOREIGN KEY ("country_code") REFERENCES "countries" ("code");
-
-ALTER TABLE "merchants" ADD FOREIGN KEY ("country_code") REFERENCES "countries" ("code");
-
-ALTER TABLE "products" ADD FOREIGN KEY ("merchant_id") REFERENCES "merchants" ("id");
-
-ALTER TABLE "merchants" ADD FOREIGN KEY ("admin_id") REFERENCES "users" ("id");

package/__test__/dbml2sql/filenames --oracle --out-file/out-files/schema.sql

@@ -1,172 +0,0 @@
--- SQL dump generated using DBML (dbml.dbdiagram.io)
--- Database: Oracle
--- Generated at: 2024-04-15T03:41:59.832Z
-
-CREATE TABLE "staff" (
-  "id" int PRIMARY KEY,
-  "first_name" nvarchar2(255),
-  "last_name" nvarchar2(255),
-  "address_id" int,
-  "picture" blob,
-  "email" nvarchar2(255),
-  "store_id" int,
-  "active" number(1),
-  "user_name" nvarchar2(255),
-  "password" nvarchar2(255),
-  "last_update" timestamp
-);
-
-CREATE TABLE "store" (
-  "id" int PRIMARY KEY,
-  "manager_staff_id" int,
-  "address_id" int,
-  "last_update" timestamp
-);
-
-CREATE TABLE "payment" (
-  "id" int PRIMARY KEY,
-  "customer_id" int,
-  "staff_id" int,
-  "rental_id" int,
-  "amount" float,
-  "payment_date" date,
-  "last_update" timestamp
-);
-
-CREATE TABLE "rental" (
-  "id" int PRIMARY KEY,
-  "rental_date" date,
-  "inventory_id" int,
-  "customer_id" int,
-  "return_date" date,
-  "staff_id" int,
-  "last_update" timestamp
-);
-
-ALTER TABLE "staff" ADD FOREIGN KEY ("store_id") REFERENCES "store" ("id");
-
-ALTER TABLE "store" ADD FOREIGN KEY ("manager_staff_id") REFERENCES "staff" ("id");
-
-ALTER TABLE "payment" ADD FOREIGN KEY ("staff_id") REFERENCES "staff" ("id");
-
-ALTER TABLE "payment" ADD FOREIGN KEY ("rental_id") REFERENCES "rental" ("id");
-
-ALTER TABLE "rental" ADD FOREIGN KEY ("staff_id") REFERENCES "staff" ("id");
-CREATE TABLE "country" (
-  "id" int PRIMARY KEY,
-  "country" nvarchar2(255),
-  "last_update" timestamp
-);
-
-CREATE TABLE "city" (
-  "id" int PRIMARY KEY,
-  "city" nvarchar2(255),
-  "country_id" int,
-  "last_update" timestamp
-);
-
-CREATE TABLE "address" (
-  "id" int PRIMARY KEY,
-  "address" nvarchar2(255),
-  "address2" nvarchar2(255),
-  "district" nvarchar2(255),
-  "city_id" int,
-  "postal_code" nvarchar2(255),
-  "phone" nvarchar2(255),
-  "last_update" timestamp
-);
-
-CREATE TABLE "customer" (
-  "id" int PRIMARY KEY,
-  "store_id" int,
-  "first_name" nvarchar2(255),
-  "last_name" nvarchar2(255),
-  "email" nvarchar2(255),
-  "address_id" int,
-  "active" number(1),
-  "create_Date" timestamp,
-  "last_update" timestamp
-);
-
-CREATE INDEX "IDX_CUSTOMER" ON "customer" ("id", "first_name");
-
-ALTER TABLE "city" ADD FOREIGN KEY ("country_id") REFERENCES "country" ("id");
-
-ALTER TABLE "address" ADD FOREIGN KEY ("city_id") REFERENCES "city" ("id");
-
-ALTER TABLE "customer" ADD FOREIGN KEY ("address_id") REFERENCES "address" ("id");
-CREATE TABLE "category" (
-  "id" int PRIMARY KEY,
-  "name" nvarchar2(255),
-  "last_update" timestamp
-);
-
-CREATE TABLE "film_category" (
-  "id" int PRIMARY KEY,
-  "category_id" int,
-  "last_update" timestamp
-);
-
-CREATE TABLE "language" (
-  "id" int PRIMARY KEY,
-  "name" nvarchar2(255),
-  "last_update" timestamp
-);
-
-CREATE TABLE "film_text" (
-  "id" int PRIMARY KEY,
-  "film_id" int,
-  "title" nvarchar2(255),
-  "description" nclob
-);
-
-CREATE TABLE "actor" (
-  "id" int PRIMARY KEY,
-  "first_name" nvarchar2(255),
-  "last_name" nvarchar2(255),
-  "last_update" timestamp
-);
-
-CREATE TABLE "film" (
-  "id" int PRIMARY KEY,
-  "title" nvarchar2(255),
-  "description" nclob,
-  "releaase_year" int,
-  "language_id" int,
-  "original_language_id" int,
-  "rental_duration" int,
-  "rental_rate" float,
-  "length" int,
-  "replacement_cost" float,
-  "rating" nvarchar2(255),
-  "special_feature" nvarchar2(255),
-  "last_update" timestamp
-);
-
-CREATE TABLE "film_actor" (
-  "id" int PRIMARY KEY,
-  "film_id" int,
-  "actor_id" int,
-  "last_update" timestamp
-);
-
-CREATE TABLE "inventory" (
-  "id" int PRIMARY KEY,
-  "film_id" int,
-  "store_id" int,
-  "last_update" timestamp
-);
-
-ALTER TABLE "film_category" ADD FOREIGN KEY ("category_id") REFERENCES "category" ("id");
-
-ALTER TABLE "film_text" ADD FOREIGN KEY ("film_id") REFERENCES "film" ("id");
-
-ALTER TABLE "film" ADD FOREIGN KEY ("language_id") REFERENCES "language" ("id");
-
-ALTER TABLE "film" ADD FOREIGN KEY ("original_language_id") REFERENCES "language" ("id");
-
-ALTER TABLE "film_actor" ADD FOREIGN KEY ("film_id") REFERENCES "film" ("id");
-
-ALTER TABLE "film_actor" ADD FOREIGN KEY ("actor_id") REFERENCES "actor" ("id");
-
-ALTER TABLE "inventory" ADD FOREIGN KEY ("film_id") REFERENCES "film" ("id");

package/__test__/dbml2sql/multiple_schema_oracle/out-files/multiple_schema.out.sql

@@ -1,88 +0,0 @@
--- SQL dump generated using DBML (dbml.dbdiagram.io)
--- Database: Oracle
--- Generated at: 2024-04-15T03:42:03.558Z
-
-CREATE USER "C##test01"
-NO AUTHENTICATION
-DEFAULT TABLESPACE system
-TEMPORARY TABLESPACE temp
-QUOTA UNLIMITED ON system;
-
-CREATE USER "C##test02"
-NO AUTHENTICATION
-DEFAULT TABLESPACE system
-TEMPORARY TABLESPACE temp
-QUOTA UNLIMITED ON system;
-
-CREATE TABLE "users" (
-  "id" int PRIMARY KEY
-);
-
-CREATE TABLE "products" (
-  "id" int PRIMARY KEY,
-  "user_id" int NOT NULL
-);
-
-CREATE TABLE "C##test02"."users_products" (
-  "users_id" int,
-  "products_id" int,
-  PRIMARY KEY ("users_id", "products_id")
-);
-
-CREATE TABLE "users_products" (
-  "users_id" int,
-  "products_id" int,
-  PRIMARY KEY ("users_id", "products_id")
-);
-
-CREATE TABLE "C##test01"."users_products" (
-  "users_id" int,
-  "products_id" int,
-  PRIMARY KEY ("users_id", "products_id")
-);
-
-CREATE TABLE "C##test01"."users" (
-  "id" int PRIMARY KEY
-);
-
-CREATE TABLE "C##test01"."products" (
-  "id" int PRIMARY KEY,
-  "user_id" int NOT NULL
-);
-
-CREATE TABLE "C##test02"."users" (
-  "id" int PRIMARY KEY
-);
-
-CREATE TABLE "C##test02"."products" (
-  "id" int PRIMARY KEY,
-  "user_id" int NOT NULL
-);
-
-GRANT REFERENCES ON "C##test01"."users" TO PUBLIC;
-
-GRANT REFERENCES ON "users" TO PUBLIC;
-
-GRANT REFERENCES ON "C##test02"."users" TO PUBLIC;
-
-GRANT REFERENCES ON "products" TO PUBLIC;
-
-GRANT REFERENCES ON "C##test02"."products" TO PUBLIC;
-
-ALTER TABLE "products" ADD FOREIGN KEY ("user_id") REFERENCES "C##test01"."users" ("id");
-
-ALTER TABLE "C##test01"."products" ADD FOREIGN KEY ("user_id") REFERENCES "users" ("id");
-
-ALTER TABLE "C##test01"."products" ADD FOREIGN KEY ("user_id") REFERENCES "C##test01"."users" ("id");
-
-ALTER TABLE "C##test02"."users_products" ADD FOREIGN KEY ("users_id") REFERENCES "C##test02"."users" ("id");
-
-ALTER TABLE "C##test02"."users_products" ADD FOREIGN KEY ("products_id") REFERENCES "products" ("id");
-
-ALTER TABLE "users_products" ADD FOREIGN KEY ("users_id") REFERENCES "users" ("id");
-
-ALTER TABLE "users_products" ADD FOREIGN KEY ("products_id") REFERENCES "C##test02"."products" ("id");
-
-ALTER TABLE "C##test01"."users_products" ADD FOREIGN KEY ("users_id") REFERENCES "C##test01"."users" ("id");
-
-ALTER TABLE "C##test01"."users_products" ADD FOREIGN KEY ("products_id") REFERENCES "C##test02"."products" ("id");