@dbml/connector 5.0.0 → 5.2.0

package/__tests__/connectors/mysql/expect-out-files/schema.json

@@ -72,6 +72,12 @@
         "value": ""
       }
     },
+    {
+      "name": "table_with_composite_primary_and_unique_indexes",
+      "note": {
+        "value": ""
+      }
+    },
     {
       "name": "users",
       "note": {
@@ -882,6 +888,60 @@
         }
       }
     ],
+    "table_with_composite_primary_and_unique_indexes": [
+      {
+        "name": "col1",
+        "type": {
+          "type_name": "int",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "col2",
+        "type": {
+          "type_name": "int",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "col3",
+        "type": {
+          "type_name": "int",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": false,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "col4",
+        "type": {
+          "type_name": "int",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": false,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      }
+    ],
     "users": [
       {
         "name": "user_id",
@@ -1297,7 +1357,7 @@
     "composite_key_1": [
       {
         "name": "PRIMARY",
-        "primary": true,
+        "pk": true,
         "columns": [
           {
             "type": "column",
@@ -1327,7 +1387,7 @@
     "composite_key_2": [
       {
         "name": "PRIMARY",
-        "primary": true,
+        "pk": true,
         "columns": [
           {
             "type": "column",
@@ -1339,52 +1399,122 @@
           }
         ]
       }
+    ],
+    "table_with_composite_primary_and_unique_indexes": [
+      {
+        "name": "col3",
+        "unique": true,
+        "columns": [
+          {
+            "type": "column",
+            "value": "col3"
+          },
+          {
+            "type": "column",
+            "value": "col4"
+          }
+        ]
+      },
+      {
+        "name": "PRIMARY",
+        "pk": true,
+        "columns": [
+          {
+            "type": "column",
+            "value": "col1"
+          },
+          {
+            "type": "column",
+            "value": "col2"
+          }
+        ]
+      }
     ]
   },
   "tableConstraints": {
     "categories": {
       "cat_id": {
+        "checks": [],
         "pk": true
       }
     },
     "default_example": {
       "id": {
+        "checks": [],
         "pk": true
       }
     },
     "hash_index_example": {
       "id": {
+        "checks": [],
         "pk": true
       }
     },
     "index_example": {
       "email": {
+        "checks": [],
         "unique": true
       },
       "id": {
+        "checks": [],
         "pk": true
       }
     },
     "orders": {
       "order_id": {
+        "checks": [],
         "pk": true
       }
     },
     "products": {
       "id": {
+        "checks": [],
         "pk": true
+      },
+      "total_value": {
+        "checks": [
+          {
+            "name": "products_chk_2",
+            "expression": "`total_value` > 0"
+          }
+        ]
+      },
+      "quantity": {
+        "checks": [
+          {
+            "name": "max_quantity",
+            "expression": "`quantity` < 10000"
+          }
+        ]
       }
     },
     "users": {
       "email": {
+        "checks": [],
         "unique": true
       },
       "user_id": {
+        "checks": [],
         "pk": true
       },
       "username": {
+        "checks": [],
         "unique": true
       }
     }
+  },
+  "checks": {
+    "users": [
+      {
+        "name": "chk_last_login",
+        "expression": "`created_at` <= `last_login`"
+      }
+    ],
+    "products": [
+      {
+        "name": "products_chk_1",
+        "expression": "(`price` > 0) and (`price` < 1000000)"
+      }
+    ]
   }
 }

package/__tests__/connectors/postgres/expect-out-files/schema.json

@@ -97,6 +97,13 @@
       "note": {
         "value": ""
       }
+    },
+    {
+      "name": "table_with_composite_primary_and_unique_indexes",
+      "schemaName": "public",
+      "note": {
+        "value": ""
+      }
     }
   ],
   "fields": {
@@ -1270,6 +1277,60 @@
           "value": ""
         }
       }
+    ],
+    "public.table_with_composite_primary_and_unique_indexes": [
+      {
+        "name": "col1",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "col2",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": true,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "col3",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": false,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      },
+      {
+        "name": "col4",
+        "type": {
+          "type_name": "int4",
+          "schemaName": null
+        },
+        "dbdefault": null,
+        "not_null": false,
+        "increment": false,
+        "note": {
+          "value": ""
+        }
+      }
     ]
   },
   "refs": [
@@ -1447,7 +1508,9 @@
             "type": "column",
             "value": "nationalityid"
           }
-        ]
+        ],
+        "pk": true,
+        "unique": false
       }
     ],
     "public.order_items": [
@@ -1463,7 +1526,9 @@
             "type": "column",
             "value": "product_id"
           }
-        ]
+        ],
+        "pk": false,
+        "unique": true
       },
       {
         "name": "idx_order_items_order_product",
@@ -1477,7 +1542,9 @@
             "type": "column",
             "value": "product_id"
           }
-        ]
+        ],
+        "pk": false,
+        "unique": false
       }
     ],
     "public.orders": [
@@ -1493,7 +1560,9 @@
             "type": "column",
             "value": "order_date"
           }
-        ]
+        ],
+        "pk": false,
+        "unique": false
       }
     ],
     "public.products": [
@@ -1505,7 +1574,43 @@
             "type": "column",
             "value": "category"
           }
-        ]
+        ],
+        "pk": false,
+        "unique": false
+      }
+    ],
+    "public.table_with_composite_primary_and_unique_indexes": [
+      {
+        "name": "table_with_composite_primary_and_unique_indexes_pkey",
+        "type": "btree",
+        "columns": [
+          {
+            "type": "column",
+            "value": "col1"
+          },
+          {
+            "type": "column",
+            "value": "col2"
+          }
+        ],
+        "pk": true,
+        "unique": false
+      },
+      {
+        "name": "table_with_composite_primary_and_unique_indexes_col3_col4_key",
+        "type": "btree",
+        "columns": [
+          {
+            "type": "column",
+            "value": "col3"
+          },
+          {
+            "type": "column",
+            "value": "col4"
+          }
+        ],
+        "pk": false,
+        "unique": true
       }
     ],
     "public.users": [
@@ -1517,7 +1622,9 @@
             "type": "column",
             "value": "full_name"
           }
-        ]
+        ],
+        "pk": false,
+        "unique": false
       },
       {
         "name": "idx_users_email",
@@ -1527,7 +1634,9 @@
             "type": "column",
             "value": "email"
           }
-        ]
+        ],
+        "pk": false,
+        "unique": false
       },
       {
         "name": "users_is_active_lower_idx",
@@ -1541,79 +1650,181 @@
             "type": "expression",
             "value": "lower((full_name)::text)"
           }
-        ]
+        ],
+        "pk": false,
+        "unique": false
       }
     ]
   },
   "tableConstraints": {
     "public.all_default_values": {
       "id": {
+        "checks": [],
         "pk": true
       }
     },
     "public.books": {
       "bookid": {
+        "checks": [],
         "pk": true
       },
       "isbn": {
+        "checks": [],
         "unique": true
       }
     },
     "public.order_items": {
       "order_item_id": {
+        "checks": [],
         "pk": true
+      },
+      "quantity": {
+        "checks": [
+          {
+            "name": "chk_quantity_positive",
+            "expression": "quantity > 0"
+          }
+        ]
+      },
+      "unit_price": {
+        "checks": [
+          {
+            "name": "chk_unit_price_positive",
+            "expression": "unit_price > (0)::numeric"
+          }
+        ]
       }
     },
     "public.orders": {
       "order_id": {
+        "checks": [],
         "pk": true
+      },
+      "total_amount": {
+        "checks": [
+          {
+            "name": "chk_total_amount_positive",
+            "expression": "total_amount > (0)::numeric"
+          }
+        ]
+      },
+      "status": {
+        "checks": [
+          {
+            "name": "chk_status",
+            "expression": "(status)::text = ANY ((ARRAY['pending'::character varying, 'processing'::character varying, 'shipped'::character varying, 'delivered'::character varying, 'cancelled'::character varying])::text[])"
+          }
+        ]
       }
     },
     "public.products": {
       "product_id": {
+        "checks": [],
         "pk": true
+      },
+      "price": {
+        "checks": [
+          {
+            "name": "chk_price_positive",
+            "expression": "price > (0)::numeric"
+          }
+        ]
+      },
+      "stock_quantity": {
+        "checks": [
+          {
+            "name": "chk_stock_non_negative",
+            "expression": "stock_quantity >= 0"
+          }
+        ]
       }
     },
     "public.table1": {
       "id": {
+        "checks": [],
         "pk": true
       }
     },
     "dbml_test.table1": {
       "id": {
+        "checks": [],
         "pk": true
       }
     },
     "public.table2": {
       "id": {
+        "checks": [],
         "pk": true
       }
     },
     "dbml_test.table3": {
       "id": {
+        "checks": [],
         "pk": true
       }
     },
     "public.table_with_comments": {
       "id": {
+        "checks": [],
         "pk": true
       }
     },
     "public.user_define_data_types": {
       "id": {
+        "checks": [],
         "pk": true
+      },
+      "height": {
+        "checks": [
+          {
+            "name": "user_define_data_types_height_check",
+            "expression": "height > (0)::double precision"
+          }
+        ]
+      },
+      "weight": {
+        "checks": [
+          {
+            "name": "chk_positive_weight",
+            "expression": "weight > (0)::double precision"
+          }
+        ]
       }
     },
     "public.users": {
       "user_id": {
+        "checks": [],
         "pk": true
       },
       "email": {
+        "checks": [
+          {
+            "name": "chk_email_format",
+            "expression": "(email)::text ~* '^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Z|a-z]{2,}$'::text"
+          }
+        ],
         "unique": true
       },
       "username": {
+        "checks": [],
         "unique": true
+      },
+      "date_of_birth": {
+        "checks": [
+          {
+            "name": "chk_age",
+            "expression": "date_of_birth <= (CURRENT_DATE - '13 years'::interval)"
+          }
+        ]
       }
     }
+  },
+  "checks": {
+    "public.products": [
+      {
+        "name": "chk_created_at",
+        "expression": "created_at <= updated_at"
+      }
+    ]
   }
 }

package/dist/connectors/bigqueryConnector.js

@@ -46,8 +46,7 @@ function getDbDefault(columnDefault, defaultValueType) {
     }
     if (defaultValueType === 'string') {
         // bigquery store the double qoutes and quotes at the end and the beginning of the string: "string" or 'string'
-        // eslint-disable-next-line no-useless-escape
-        return { value: columnDefault.slice(1, -1).replaceAll("'", "\'"), type: defaultValueType };
+        return { value: columnDefault.slice(1, -1).replaceAll('\'', '\''), type: defaultValueType };
     }
     return { value: columnDefault, type: defaultValueType };
 }
@@ -209,7 +208,7 @@ async function generateTableConstraints(client, projectId, datasetId) {
             inlinePrimaryKeyMap[key] = {};
         }
         if (!inlinePrimaryKeyMap[key][columnNames]) {
-            inlinePrimaryKeyMap[key][columnNames] = {};
+            inlinePrimaryKeyMap[key][columnNames] = { checks: [] };
         }
         inlinePrimaryKeyMap[key][columnNames].pk = true;
     });
@@ -266,6 +265,8 @@ async function fetchSchemaJsonByDataset(client, projectId, datasetId) {
         enums: [],
         indexes: (0, helpers_1.mergeIndexDictionary)(indexMap, compositePrimaryKeyMap),
         tableConstraints: inlinePrimaryKeyMap,
+        // Checks are not supported in BigQuery
+        checks: {},
     };
 }
 async function fetchSchemaJson(keyFilename) {
@@ -284,7 +285,7 @@ async function fetchSchemaJson(keyFilename) {
         acc.tableConstraints = (0, helpers_1.mergeTableConstraintDictionary)(acc.tableConstraints, tableConstraints);
         return acc;
     }, {
-        tables: [], fields: {}, tableConstraints: {}, indexes: {}, refs: [], enums: [],
+        tables: [], fields: {}, tableConstraints: {}, indexes: {}, refs: [], enums: [], checks: {},
     });
     return res;
 }