@dbml/connector 5.2.0 → 5.3.1

package/__tests__/connector.test.ts

@@ -43,5 +43,5 @@ describe('@dbml/connector', () => {
 
   test.each(scanDirNames(__dirname, 'connectors'))('connectors/%s', async (dirName) => {
     await runTest(path.join(__dirname, 'connectors', dirName));
-  });
+  }, 10000);
 });

package/__tests__/connectors/mssql/out-files/schema.json

@@ -97,27 +97,6 @@
       "note": {
         "value": ""
       }
-    },
-    {
-      "name": "AddressInfo",
-      "schemaName": "dbo",
-      "note": {
-        "value": ""
-      }
-    },
-    {
-      "name": "AddressInfo2",
-      "schemaName": "dbo",
-      "note": {
-        "value": ""
-      }
-    },
-    {
-      "name": "TestDescriptionTable",
-      "schemaName": "dbo",
-      "note": {
-        "value": "This is the custom comment name on table."
-      }
     }
   ],
   "fields": {
@@ -475,8 +454,8 @@
       {
         "name": "status",
         "type": {
-          "type_name": "varchar(20)",
-          "schemaName": null
+          "type_name": "chk_status",
+          "schemaName": "dbo"
         },
         "dbdefault": {
           "type": "string",
@@ -1162,7 +1141,7 @@
         },
         "dbdefault": {
           "type": "string",
-          "value": "<Books>\n    <Book>\n      <Title>The Great Gatsby</Title>\n      <Author>F. Scott Fitzgerald</Author>\n      <Year>1925</Year>\n      <Price>10.99</Price>\n      <Publisher>Scribner</Publisher>\n      <Location>New York</Location>\n      <Genre>Fiction</Genre>\n      <Subgenre>Classic</Subgenre>\n    </Book>\n    <Book>\n      <Title>1984</Title>\n      <Author>George Orwell</Author>\n      <Year>1949</Year>\n      <Price>8.99</Price>\n      <Publisher>Secker & Warburg</Publisher>\n      <Location>London</Location>\n      <Genre>Dystopian</Genre>\n      <Subgenre>Political Fiction</Subgenre>\n    </Book>\n  </Books>"
+          "value": "<Books>\r\n    <Book>\r\n      <Title>The Great Gatsby</Title>\r\n      <Author>F. Scott Fitzgerald</Author>\r\n      <Year>1925</Year>\r\n      <Price>10.99</Price>\r\n      <Publisher>Scribner</Publisher>\r\n      <Location>New York</Location>\r\n      <Genre>Fiction</Genre>\r\n      <Subgenre>Classic</Subgenre>\r\n    </Book>\r\n    <Book>\r\n      <Title>1984</Title>\r\n      <Author>George Orwell</Author>\r\n      <Year>1949</Year>\r\n      <Price>8.99</Price>\r\n      <Publisher>Secker & Warburg</Publisher>\r\n      <Location>London</Location>\r\n      <Genre>Dystopian</Genre>\r\n      <Subgenre>Political Fiction</Subgenre>\r\n    </Book>\r\n  </Books>"
         },
         "not_null": false,
         "increment": false,
@@ -1296,8 +1275,8 @@
       {
         "name": "gender",
         "type": {
-          "type_name": "nvarchar(10)",
-          "schemaName": null
+          "type_name": "chk_gender",
+          "schemaName": "dbo"
         },
         "dbdefault": null,
         "not_null": false,
@@ -1536,119 +1515,46 @@
           "value": ""
         }
       }
-    ],
-    "dbo.AddressInfo": [
-      {
-        "name": "AddressID",
-        "type": {
-          "type_name": "uniqueidentifier(16)",
-          "schemaName": null
-        },
-        "dbdefault": null,
-        "not_null": true,
-        "increment": false,
-        "note": {
-          "value": ""
-        }
-      },
-      {
-        "name": "AddressFormatID",
-        "type": {
-          "type_name": "uniqueidentifier(16)",
-          "schemaName": null
-        },
-        "dbdefault": null,
-        "not_null": true,
-        "increment": false,
-        "note": {
-          "value": ""
-        }
-      }
-    ],
-    "dbo.AddressInfo2": [
-      {
-        "name": "A1",
-        "type": {
-          "type_name": "uniqueidentifier(16)",
-          "schemaName": null
+    ]
+  },
+  "enums": [
+    {
+      "name": "chk_status",
+      "schemaName": "dbo",
+      "values": [
+        {
+          "name": "cancelled"
         },
-        "dbdefault": null,
-        "not_null": true,
-        "increment": false,
-        "note": {
-          "value": ""
-        }
-      },
-      {
-        "name": "A2",
-        "type": {
-          "type_name": "uniqueidentifier(16)",
-          "schemaName": null
+        {
+          "name": "delivered"
         },
-        "dbdefault": null,
-        "not_null": true,
-        "increment": false,
-        "note": {
-          "value": ""
-        }
-      },
-      {
-        "name": "A3",
-        "type": {
-          "type_name": "uniqueidentifier(16)",
-          "schemaName": null
+        {
+          "name": "shipped"
         },
-        "dbdefault": null,
-        "not_null": true,
-        "increment": false,
-        "note": {
-          "value": ""
-        }
-      },
-      {
-        "name": "A4",
-        "type": {
-          "type_name": "uniqueidentifier(16)",
-          "schemaName": null
+        {
+          "name": "processing"
         },
-        "dbdefault": null,
-        "not_null": true,
-        "increment": false,
-        "note": {
-          "value": ""
+        {
+          "name": "pending"
         }
-      }
-    ],
-    "dbo.TestDescriptionTable": [
-      {
-        "name": "Id",
-        "type": {
-          "type_name": "int(10)",
-          "schemaName": null
+      ]
+    },
+    {
+      "name": "chk_gender",
+      "schemaName": "dbo",
+      "values": [
+        {
+          "name": "Other"
         },
-        "dbdefault": null,
-        "not_null": false,
-        "increment": false,
-        "note": {
-          "value": "Primary key identifier."
-        }
-      },
-      {
-        "name": "Name",
-        "type": {
-          "type_name": "nvarchar(100)",
-          "schemaName": null
+        {
+          "name": "Female"
         },
-        "dbdefault": null,
-        "not_null": false,
-        "increment": false,
-        "note": {
-          "value": "Name of the entity."
+        {
+          "name": "Male"
         }
-      }
-    ]
-  },
-  "enums": [],
+      ]
+    }
+  ],
   "refs": [
     {
       "name": "FK_AuthorNationality",
@@ -1853,222 +1759,100 @@
   "tableConstraints": {
     "dbo.Authors": {
       "AuthorID": {
-        "checks": [],
         "pk": true
       },
       "NationalityID": {
-        "checks": [],
         "pk": true
       },
       "AuthorName": {
-        "checks": [],
         "unique": true
       },
       "BirthYear": {
-        "checks": [],
         "unique": true
       }
     },
     "dbo.Books": {
       "BookID": {
-        "checks": [],
         "pk": true
       },
       "AuthorID": {
-        "checks": [],
         "pk": true
       },
       "ISBN": {
-        "checks": [],
         "unique": true
       }
     },
     "dbo.DatetimeTypes": {
       "ID": {
-        "checks": [],
         "pk": true
       }
     },
     "dbo.gender_reference": {
       "value": {
-        "checks": [],
         "pk": true
       }
     },
     "dbo.NumberTypes": {
       "ID": {
-        "checks": [],
         "pk": true
       }
     },
     "dbo.NumberTypesNoDefault": {
       "ID": {
-        "checks": [],
         "pk": true
       }
     },
     "dbo.ObjectTypes": {
       "Id": {
-        "checks": [],
         "pk": true
       }
     },
     "dbo.order_items": {
       "order_item_id": {
-        "checks": [],
         "pk": true
       },
       "order_id": {
-        "checks": [],
         "unique": true
       },
       "product_id": {
-        "checks": [],
         "unique": true
-      },
-      "quantity": {
-        "checks": [
-          {
-            "name": "chk_quantity_positive",
-            "expression": "[quantity]>(0)"
-          }
-        ]
-      },
-      "unit_price": {
-        "checks": [
-          {
-            "name": "chk_unit_price_positive",
-            "expression": "[unit_price]>(0)"
-          }
-        ]
       }
     },
     "dbo.orders": {
       "order_id": {
-        "checks": [],
         "pk": true
-      },
-      "total_amount": {
-        "checks": [
-          {
-            "name": "chk_total_amount_positive",
-            "expression": "[total_amount]>(0)"
-          }
-        ]
-      },
-      "status": {
-        "checks": [
-          {
-            "name": "chk_status",
-            "expression": "[status]='cancelled' OR [status]='delivered' OR [status]='shipped' OR [status]='processing' OR [status]='pending'"
-          }
-        ]
       }
     },
     "dbo.products": {
       "product_id": {
-        "checks": [],
         "pk": true
-      },
-      "price": {
-        "checks": [
-          {
-            "name": "chk_price_positive",
-            "expression": "[price]>(0)"
-          }
-        ]
-      },
-      "stock_quantity": {
-        "checks": [
-          {
-            "name": "chk_stock_non_negative",
-            "expression": "[stock_quantity]>=(0)"
-          }
-        ]
       }
     },
     "dbo.StringTypes": {
       "Id": {
-        "checks": [],
         "pk": true
       }
     },
     "dbo.table_with_comments": {
       "id": {
-        "checks": [],
         "pk": true
       }
     },
     "dbo.user_define_data_types": {
       "id": {
-        "checks": [],
         "pk": true
-      },
-      "gender": {
-        "checks": [
-          {
-            "name": "chk_gender",
-            "expression": "[gender]='Other' OR [gender]='Female' OR [gender]='Male'"
-          }
-        ]
       }
     },
     "dbo.users": {
       "user_id": {
-        "checks": [],
         "pk": true
       },
       "email": {
-        "checks": [
-          {
-            "name": "chk_email_format",
-            "expression": "[email] like '%_@_%._%'"
-          }
-        ],
         "unique": true
       },
       "username": {
-        "checks": [],
         "unique": true
-      },
-      "date_of_birth": {
-        "checks": [
-          {
-            "name": "chk_age",
-            "expression": "[date_of_birth]<=dateadd(year,(-13),getdate())"
-          }
-        ]
-      }
-    },
-    "dbo.TestDescriptionTable": {
-      "Name": {
-        "checks": [
-          {
-            "name": "chk_name_len",
-            "expression": "len([Name])>(6)"
-          }
-        ]
       }
     }
-  },
-  "checks": {
-    "dbo.user_define_data_types": [
-      {
-        "name": "chk_age_range",
-        "expression": "[age_start]<=[age_end]"
-      }
-    ],
-    "dbo.AddressInfo": [
-      {
-        "name": "CK_Address_Valid",
-        "expression": "([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')"
-      }
-    ],
-    "dbo.AddressInfo2": [
-      {
-        "name": "CK_Address_Valid2",
-        "expression": "([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')"
-      }
-    ]
   }
 }

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

@@ -1517,4 +1517,4 @@
       }
     ]
   }
-}
+}

package/__tests__/connectors/oracle/connection.json

@@ -0,0 +1,4 @@
+{
+  "connection": "dbml/root@localhost:1521/dbml_test",
+  "format": "oracle"
+}