Optional ref

dbml-playground/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/playground",
-  "version": "8.3.1",
+  "version": "9.0.0-optional-ref.1",
   "description": "Interactive playground for debugging and visualizing the DBML parser pipeline",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -25,8 +25,8 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@dbml/core": "^8.3.1",
-    "@dbml/parse": "^8.3.1",
+    "@dbml/core": "^9.0.0-optional-ref.1",
+    "@dbml/parse": "^9.0.0-optional-ref.0",
     "@phosphor-icons/vue": "^2.2.0",
     "floating-vue": "^5.2.2",
     "lodash-es": "^4.17.21",

dbml-playground/src/components/editor/dbml_services.ts

@@ -17,6 +17,7 @@ export async function setupDbmlServices (compiler: Compiler): Promise<void> {
   monaco.languages.registerDefinitionProvider(languageId, services.definitionProvider as any);
   monaco.languages.registerReferenceProvider(languageId, services.referenceProvider as any);
   monaco.languages.registerCompletionItemProvider(languageId, services.autocompletionProvider as any);
+  monaco.languages.registerCodeActionProvider(languageId, services.codeActionProvider as any);
 }
 
 export function updateDiagnosticMarkers (model: monaco.editor.ITextModel): void {

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.3.1",
+  "version": "9.0.0-optional-ref.1",
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

packages/dbml-cli/__tests__/db2dbml/mssql/expect-out-files/schema.dbml

@@ -223,4 +223,4 @@ Ref "fk_order":"dbo"."orders"."order_id" < "dbo"."order_items"."order_id" [updat
 
 Ref "fk_user":"dbo"."users"."user_id" < "dbo"."orders"."user_id" [update: cascade, delete: cascade]
 
-Ref "fk_gender":"dbo"."gender_reference"."value" < "dbo"."user_define_data_types"."gender"
+Ref "fk_gender":"dbo"."gender_reference"."value" <? "dbo"."user_define_data_types"."gender"

packages/dbml-cli/__tests__/db2dbml/mysql/expect-out-files/schema.dbml

@@ -197,4 +197,4 @@ Ref "fk_detail_items_orders":"orders"."order_id" < "order_items"."order_id" [del
 
 Ref "fk_detail_items_products":"products"."id" < "order_items"."product_id"
 
-Ref "fk_order_user":"users"."user_id" < "orders"."user_id" [delete: set null]
+Ref "fk_order_user":"users"."user_id" <? "orders"."user_id" [delete: set null]

packages/dbml-cli/__tests__/db2dbml/oracle/expect-out-files/schema.dbml

@@ -400,20 +400,20 @@ Table "SPECIAL_DATA_TYPES" {
   "UROWID_SIZED" urowid(100)
 }
 
-Ref "FK_SELF_REF":"SELF_REF_FK"."ID" < "SELF_REF_FK"."PARENT_ID" [delete: set null]
+Ref "FK_SELF_REF":"SELF_REF_FK"."ID" <? "SELF_REF_FK"."PARENT_ID" [delete: set null]
 
 Ref "FK_CHILD_PARENT":"FK_PARENT"."ID" < "FK_CHILD"."PARENT_ID" [delete: cascade]
 
-Ref "FK_COMPOSITE_SELF":"COMPOSITE_SELF_REF".("DEPT_ID", "EMP_ID") < "COMPOSITE_SELF_REF".("PARENT_DEPT_ID", "PARENT_EMP_ID") [delete: set null]
+Ref "FK_COMPOSITE_SELF":"COMPOSITE_SELF_REF".("DEPT_ID", "EMP_ID") <? "COMPOSITE_SELF_REF".("PARENT_DEPT_ID", "PARENT_EMP_ID") [delete: set null]
 
-Ref "FK_ALTER_PARENT":"ALTER_FK_PARENT"."ID" < "ALTER_FK_CHILD"."PARENT_ID" [delete: cascade]
+Ref "FK_ALTER_PARENT":"ALTER_FK_PARENT"."ID" <? "ALTER_FK_CHILD"."PARENT_ID" [delete: cascade]
 
-Ref "FK_ALTER_SELF":"ALTER_SELF_REF"."ID" < "ALTER_SELF_REF"."PARENT_ID" [delete: set null]
+Ref "FK_ALTER_SELF":"ALTER_SELF_REF"."ID" <? "ALTER_SELF_REF"."PARENT_ID" [delete: set null]
 
-Ref "FK_ALTER_COMPOSITE":"ALTER_COMPOSITE_FK_PARENT".("DEPT_ID", "EMP_ID") < "ALTER_COMPOSITE_FK_CHILD".("REF_DEPT_ID", "REF_EMP_ID")
+Ref "FK_ALTER_COMPOSITE":"ALTER_COMPOSITE_FK_PARENT".("DEPT_ID", "EMP_ID") <? "ALTER_COMPOSITE_FK_CHILD".("REF_DEPT_ID", "REF_EMP_ID")
 
-Ref "FK_REF_SIMPLE":"REF_SIMPLE_PARENT"."ID" < "REF_SIMPLE_CHILD"."PARENT_ID"
+Ref "FK_REF_SIMPLE":"REF_SIMPLE_PARENT"."ID" <? "REF_SIMPLE_CHILD"."PARENT_ID"
 
-Ref "FK_REF_COMPOSITE":"REF_COMPOSITE_PARENT".("KEY1", "KEY2") < "REF_COMPOSITE_CHILD".("FK1", "FK2")
+Ref "FK_REF_COMPOSITE":"REF_COMPOSITE_PARENT".("KEY1", "KEY2") <? "REF_COMPOSITE_CHILD".("FK1", "FK2")
 
-Ref "FK_ALTER_COMP_SELF":"ALTER_COMP_SELF_REF".("DEPT_ID", "EMP_ID") < "ALTER_COMP_SELF_REF".("PARENT_DEPT_ID", "PARENT_EMP_ID")
+Ref "FK_ALTER_COMP_SELF":"ALTER_COMP_SELF_REF".("DEPT_ID", "EMP_ID") <? "ALTER_COMP_SELF_REF".("PARENT_DEPT_ID", "PARENT_EMP_ID")

packages/dbml-cli/__tests__/db2dbml/postgres/expect-out-files/schema.dbml

@@ -187,7 +187,7 @@ Table "table_with_composite_primary_and_unique_indexes" {
   }
 }
 
-Ref "fk_authornationality":"authors".("authorid", "nationalityid") < "books".("authorid", "nationalityid") [delete: cascade]
+Ref "fk_authornationality":"authors".("authorid", "nationalityid") <? "books".("authorid", "nationalityid") [delete: cascade]
 
 Ref "fk_order":"orders"."order_id" < "order_items"."order_id" [delete: cascade]
 

packages/dbml-cli/__tests__/sql2dbml/filename --mssql --out-file/expect-out-files/schema.dbml

@@ -20,6 +20,6 @@ Table "CodeDef" {
   }
 }
 
-Ref "fk__CodeDef__ParentCdKey__CodeDef__CdKey":"CodeDef"."CdKey" < "CodeDef"."ParentCdKey"
+Ref "fk__CodeDef__ParentCdKey__CodeDef__CdKey":"CodeDef"."CdKey" <? "CodeDef"."ParentCdKey"
 
-Ref "fk__CodeDef__UserMasterKeyLastEditedBy__UserMaster_UserMasterKey":"UserMaster"."UserMasterKey" < "CodeDef"."UserMasterKeyLastEditedBy"
+Ref "fk__CodeDef__UserMasterKeyLastEditedBy__UserMaster_UserMasterKey":"UserMaster"."UserMasterKey" <? "CodeDef"."UserMasterKeyLastEditedBy"

packages/dbml-cli/__tests__/sql2dbml/filename --mysql --out-file/expect-out-files/schema.dbml

@@ -61,14 +61,14 @@ Table "countries" {
   "continent_name" varchar(255)
 }
 
-Ref:"orders"."id" < "order_items"."order_id"
+Ref:"orders"."id" <? "order_items"."order_id"
 
-Ref:"products"."id" < "order_items"."product_id"
+Ref:"products"."id" <? "order_items"."product_id"
 
-Ref:"countries"."code" < "users"."country_code"
+Ref:"countries"."code" <? "users"."country_code"
 
-Ref:"countries"."code" < "merchants"."country_code"
+Ref:"countries"."code" <? "merchants"."country_code"
 
 Ref:"merchants"."id" < "products"."merchant_id"
 
-Ref:"users"."id" < "merchants"."admin_id"
+Ref:"users"."id" <? "merchants"."admin_id"

packages/dbml-cli/__tests__/sql2dbml/filename --mysql stdout/stdout.txt

@@ -61,15 +61,15 @@ Table "countries" {
   "continent_name" varchar(255)
 }
 
-Ref:"orders"."id" < "order_items"."order_id"
+Ref:"orders"."id" <? "order_items"."order_id"
 
-Ref:"products"."id" < "order_items"."product_id"
+Ref:"products"."id" <? "order_items"."product_id"
 
-Ref:"countries"."code" < "users"."country_code"
+Ref:"countries"."code" <? "users"."country_code"
 
-Ref:"countries"."code" < "merchants"."country_code"
+Ref:"countries"."code" <? "merchants"."country_code"
 
 Ref:"merchants"."id" < "products"."merchant_id"
 
-Ref:"users"."id" < "merchants"."admin_id"
+Ref:"users"."id" <? "merchants"."admin_id"
 

packages/dbml-cli/__tests__/sql2dbml/filename --oracle --out-file/expect-out-files/schema.dbml

@@ -58,26 +58,26 @@ Table "task_hours" {
   "hours_worked" NUMBER(5,2)
 }
 
-Ref "fk_emp_dept":"departments"."dept_id" < "employees"."department_id"
+Ref "fk_emp_dept":"departments"."dept_id" <? "employees"."department_id"
 
-Ref "fk_dept_location":"locations"."location_id" < "departments"."location_id"
+Ref "fk_dept_location":"locations"."location_id" <? "departments"."location_id"
 
-Ref "fk_loc_country":"countries"."country_code" < "locations"."country_code"
+Ref "fk_loc_country":"countries"."country_code" <? "locations"."country_code"
 
-Ref "fk_emp_manager":"employees"."emp_id" < "employees"."manager_id"
+Ref "fk_emp_manager":"employees"."emp_id" <? "employees"."manager_id"
 
-Ref "fk_dept_manager":"employees"."emp_id" < "departments"."manager_id"
+Ref "fk_dept_manager":"employees"."emp_id" <? "departments"."manager_id"
 
-Ref:"departments"."dept_id" < "projects"."dept_id"
+Ref:"departments"."dept_id" <? "projects"."dept_id"
 
-Ref:"employees"."emp_id" < "assignments"."emp_id"
+Ref:"employees"."emp_id" <? "assignments"."emp_id"
 
-Ref:"projects"."project_id" < "assignments"."project_id"
+Ref:"projects"."project_id" <? "assignments"."project_id"
 
-Ref "fk_task_hours_project_task":"project_tasks".("project_id", "task_id") < "task_hours".("project_id", "task_id")
+Ref "fk_task_hours_project_task":"project_tasks".("project_id", "task_id") ?<? "task_hours".("project_id", "task_id")
 
-Ref "fk_proj_lead_emp":"employees"."emp_id" < "projects"."lead_emp_id"
+Ref "fk_proj_lead_emp":"employees"."emp_id" <? "projects"."lead_emp_id"
 
-Ref "fk_proj_backup_emp":"employees"."emp_id" < "projects"."backup_emp_id"
+Ref "fk_proj_backup_emp":"employees"."emp_id" <? "projects"."backup_emp_id"
 
-Ref "fk_task_assigned_emp":"employees"."emp_id" < "project_tasks"."assigned_emp_id"
+Ref "fk_task_assigned_emp":"employees"."emp_id" <? "project_tasks"."assigned_emp_id"

packages/dbml-cli/__tests__/sql2dbml/filename --out-file/expect-out-files/schema.dbml

@@ -61,14 +61,14 @@ Table "countries" {
   "continent_name" varchar
 }
 
-Ref:"orders"."id" < "order_items"."order_id"
+Ref:"orders"."id" <? "order_items"."order_id"
 
-Ref:"products"."id" < "order_items"."product_id"
+Ref:"products"."id" <? "order_items"."product_id"
 
-Ref:"countries"."code" < "users"."country_code"
+Ref:"countries"."code" <? "users"."country_code"
 
-Ref:"countries"."code" < "merchants"."country_code"
+Ref:"countries"."code" <? "merchants"."country_code"
 
 Ref:"merchants"."id" < "products"."merchant_id"
 
-Ref:"users"."id" < "merchants"."admin_id"
+Ref:"users"."id" <? "merchants"."admin_id"

packages/dbml-cli/__tests__/sql2dbml/filename --postgres --out-file/expect-out-files/schema.dbml

@@ -61,14 +61,14 @@ Table "countries" {
   "continent_name" varchar
 }
 
-Ref:"orders"."id" < "order_items"."order_id"
+Ref:"orders"."id" <? "order_items"."order_id"
 
-Ref:"products"."id" < "order_items"."product_id"
+Ref:"products"."id" <? "order_items"."product_id"
 
-Ref:"countries"."code" < "users"."country_code"
+Ref:"countries"."code" <? "users"."country_code"
 
-Ref:"countries"."code" < "merchants"."country_code"
+Ref:"countries"."code" <? "merchants"."country_code"
 
 Ref:"merchants"."id" < "products"."merchant_id"
 
-Ref:"users"."id" < "merchants"."admin_id"
+Ref:"users"."id" <? "merchants"."admin_id"

packages/dbml-cli/__tests__/sql2dbml/filename --postgres stdout/stdout.txt

@@ -73,15 +73,15 @@ Table "comment_on_product" {
   }
 }
 
-Ref:"orders"."id" < "order_items"."order_id"
+Ref:"orders"."id" <? "order_items"."order_id"
 
-Ref:"products"."id" < "order_items"."product_id"
+Ref:"products"."id" <? "order_items"."product_id"
 
-Ref:"countries"."code" < "users"."country_code"
+Ref:"countries"."code" <? "users"."country_code"
 
-Ref:"countries"."code" < "merchants"."country_code"
+Ref:"countries"."code" <? "merchants"."country_code"
 
 Ref:"merchants"."id" < "products"."merchant_id"
 
-Ref:"users"."id" < "merchants"."admin_id"
+Ref:"users"."id" <? "merchants"."admin_id"
 

packages/dbml-cli/__tests__/sql2dbml/filename --snowflake stdout/stdout.txt

@@ -446,29 +446,29 @@ Table "floor" {
   "getdate" int
 }
 
-Ref:"HP_TEST"."CUSTOMERS"."CUSTOMER_ID" < "HP_TEST"."ORDERS"."CUSTOMER_ID"
+Ref:"HP_TEST"."CUSTOMERS"."CUSTOMER_ID" <? "HP_TEST"."ORDERS"."CUSTOMER_ID"
 
-Ref:"HP_TEST"."ORDERS"."ORDER_ID" < "HP_TEST"."ORDER_ITEMS"."ORDER_ID"
+Ref:"HP_TEST"."ORDERS"."ORDER_ID" <? "HP_TEST"."ORDER_ITEMS"."ORDER_ID"
 
-Ref:"HP_TEST"."PRODUCTS"."PRODUCT_ID" < "HP_TEST"."ORDER_ITEMS"."PRODUCT_ID"
+Ref:"HP_TEST"."PRODUCTS"."PRODUCT_ID" <? "HP_TEST"."ORDER_ITEMS"."PRODUCT_ID"
 
-Ref:"TEST_2024_06_28_10_01_ZQMIMY"."ONE".("BAR", "FOO") < "TEST_2024_06_28_10_01_ZQMIMY"."TWO".("XYZ", "ABC")
+Ref:"TEST_2024_06_28_10_01_ZQMIMY"."ONE".("BAR", "FOO") <? "TEST_2024_06_28_10_01_ZQMIMY"."TWO".("XYZ", "ABC")
 
-Ref:"TEST_2024_06_28_10_01_ZQMIMY"."ONE"."FOO" < "TEST_2024_06_28_10_01_ZQMIMY"."TWO"."QWE"
+Ref:"TEST_2024_06_28_10_01_ZQMIMY"."ONE"."FOO" <? "TEST_2024_06_28_10_01_ZQMIMY"."TWO"."QWE"
 
-Ref:"T_OUT_2"."C2" < "T_OUT_3"."C3"
+Ref:"T_OUT_2"."C2" <? "T_OUT_3"."C3"
 
-Ref:"T_OUT_5"."C2" < "T_OUT_6"."C3"
+Ref:"T_OUT_5"."C2" <? "T_OUT_6"."C3"
 
-Ref:"T_OUT_5"."C2" < "T_CONSTRAINT_3"."C3"
+Ref:"T_OUT_5"."C2" <? "T_CONSTRAINT_3"."C3"
 
-Ref:"T_OUT_5"."C2" < "T_CONSTRAINT_4"."C3"
+Ref:"T_OUT_5"."C2" <? "T_CONSTRAINT_4"."C3"
 
-Ref:"T_OUT_5"."C2" < "T_CONSTRAINT_5"."C3"
+Ref:"T_OUT_5"."C2" <? "T_CONSTRAINT_5"."C3"
 
-Ref:"T_OUT_5"."C2" < "T_CONSTRAINT_6"."C3"
+Ref:"T_OUT_5"."C2" <? "T_CONSTRAINT_6"."C3"
 
-Ref:"T_OUT_5"."C2" < "T_CONSTRAINT_8"."C3"
+Ref:"T_OUT_5"."C2" <? "T_CONSTRAINT_8"."C3"
 
-Ref:"T_OUT_5"."C2" < "T_CONSTRAINT_9"."C3"
+Ref:"T_OUT_5"."C2" <? "T_CONSTRAINT_9"."C3"
 

packages/dbml-cli/__tests__/sql2dbml/filename stdout/stdout.txt

@@ -61,15 +61,15 @@ Table "countries" {
   "continent_name" varchar
 }
 
-Ref:"orders"."id" < "order_items"."order_id"
+Ref:"orders"."id" <? "order_items"."order_id"
 
-Ref:"products"."id" < "order_items"."product_id"
+Ref:"products"."id" <? "order_items"."product_id"
 
-Ref:"countries"."code" < "users"."country_code"
+Ref:"countries"."code" <? "users"."country_code"
 
-Ref:"countries"."code" < "merchants"."country_code"
+Ref:"countries"."code" <? "merchants"."country_code"
 
 Ref:"merchants"."id" < "products"."merchant_id"
 
-Ref:"users"."id" < "merchants"."admin_id"
+Ref:"users"."id" <? "merchants"."admin_id"
 

packages/dbml-cli/__tests__/sql2dbml/filenames --mysql --out-file/expect-out-files/schema.dbml

@@ -39,15 +39,15 @@ Table "rental" {
   "last_update" timestamp
 }
 
-Ref:"store"."id" < "staff"."store_id"
+Ref:"store"."id" <? "staff"."store_id"
 
-Ref:"staff"."id" < "store"."manager_staff_id"
+Ref:"staff"."id" <? "store"."manager_staff_id"
 
-Ref:"staff"."id" < "payment"."staff_id"
+Ref:"staff"."id" <? "payment"."staff_id"
 
-Ref:"rental"."id" < "payment"."rental_id"
+Ref:"rental"."id" <? "payment"."rental_id"
 
-Ref:"staff"."id" < "rental"."staff_id"
+Ref:"staff"."id" <? "rental"."staff_id"
 Table "country" {
   "id" int [pk]
   "country" varchar(255)
@@ -88,11 +88,11 @@ Table "customer" {
   }
 }
 
-Ref:"country"."id" < "city"."country_id"
+Ref:"country"."id" <? "city"."country_id"
 
-Ref:"city"."id" < "address"."city_id"
+Ref:"city"."id" <? "address"."city_id"
 
-Ref:"address"."id" < "customer"."address_id"
+Ref:"address"."id" <? "customer"."address_id"
 Table "category" {
   "id" int [pk]
   "name" varchar(255)
@@ -155,16 +155,16 @@ Table "inventory" {
   "last_update" timestamp
 }
 
-Ref:"category"."id" < "film_category"."category_id"
+Ref:"category"."id" <? "film_category"."category_id"
 
-Ref:"inventory"."film_id" < "film_text"."film_id"
+Ref:"inventory"."film_id" ?<? "film_text"."film_id"
 
-Ref:"language"."id" < "film"."language_id"
+Ref:"language"."id" <? "film"."language_id"
 
-Ref:"language"."id" < "film"."original_language_id"
+Ref:"language"."id" <? "film"."original_language_id"
 
-Ref:"film"."id" < "film_actor"."film_id"
+Ref:"film"."id" <? "film_actor"."film_id"
 
-Ref:"actor"."id" < "film_actor"."actor_id"
+Ref:"actor"."id" <? "film_actor"."actor_id"
 
-Ref:"film"."id" < "inventory"."film_id"
+Ref:"film"."id" <? "inventory"."film_id"