Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support composite foreign keys #90

Merged
merged 19 commits into from
May 24, 2020
Merged

Support composite foreign keys #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
76566fa
Modify DBML parser to support composite foreign keys and modify endpo…
phanbaominh May 7, 2020
cf5191a
Support exporting composite fk for dbml file
phanbaominh May 8, 2020
aef97e6
- Support exporting composite foreign key for mysql
phanbaominh May 8, 2020
2fc94f7
Add support for exporting composite foreign key for postgres
phanbaominh May 8, 2020
f603f4e
Modify referential_actions test for mysql,postgres,json, dbml to incl…
phanbaominh May 8, 2020
9050748
Add support for exporting composite foreign key for mssql and change …
phanbaominh May 8, 2020
bcefa4a
Modify mysql parser to support composite foreign key
phanbaominh May 8, 2020
740c691
Fix mysql parser and change tests for parsing mysql, dbml
phanbaominh May 8, 2020
c37cc44
Add support for composite foregin key postgres parsing and change test
phanbaominh May 8, 2020
7a444bf
- Add throwing semantic error: Unequal number of endpoint fields
phanbaominh May 8, 2020
0075109
Delete some files used for testing
phanbaominh May 8, 2020
9100497
Add test cases for model_exporter
phanbaominh May 8, 2020
0027cc3
Add test case to model_structure
phanbaominh May 8, 2020
cdd5d57
- Add composite foreign key test cases to parser test
phanbaominh May 12, 2020
9fa6f0f
Replace field with fields and fieldName with fieldNames in endpoint
phanbaominh May 12, 2020
1ace0e9
Modify DBML Parser, ESLint, JSON test files:
phanbaominh May 14, 2020
90d1ea3
Minor fixes to postgres, mysql, schemarb parsers to properly support …
phanbaominh May 19, 2020
9e08f49
Seperate buildFieldName to each exporter static function
phanbaominh May 19, 2020
9c196fb
Remove a few old comment, legacy code from parser
phanbaominh May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions packages/dbml-core/__tests__/importer/json_importer/input/general_schema.in.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@
"endpoints": [
{
"tableName": "orders",
"fieldName": "id",
"fieldNames": ["id"],
"relation": "1",
"token": {
"start": {
Expand All @@ -764,7 +764,7 @@
},
{
"tableName": "order_items",
"fieldName": "order_id",
"fieldNames": ["order_id"],
"relation": "*",
"token": {
"start": {
Expand Down Expand Up @@ -798,7 +798,7 @@
"endpoints": [
{
"tableName": "products",
"fieldName": "id",
"fieldNames": ["id"],
"relation": "1",
"token": {
"start": {
Expand All @@ -815,7 +815,7 @@
},
{
"tableName": "order_items",
"fieldName": "product_id",
"fieldNames": ["product_id"],
"relation": "*",
"token": {
"start": {
Expand Down Expand Up @@ -849,7 +849,7 @@
"endpoints": [
{
"tableName": "countries",
"fieldName": "code",
"fieldNames": ["code"],
"relation": "1",
"token": {
"start": {
Expand All @@ -866,7 +866,7 @@
},
{
"tableName": "users",
"fieldName": "country_code",
"fieldNames": ["country_code"],
"relation": "*",
"token": {
"start": {
Expand Down Expand Up @@ -900,7 +900,7 @@
"endpoints": [
{
"tableName": "countries",
"fieldName": "code",
"fieldNames": ["code"],
"relation": "1",
"token": {
"start": {
Expand All @@ -917,7 +917,7 @@
},
{
"tableName": "merchants",
"fieldName": "country_code",
"fieldNames": ["country_code"],
"relation": "*",
"token": {
"start": {
Expand Down Expand Up @@ -951,7 +951,7 @@
"endpoints": [
{
"tableName": "merchants",
"fieldName": "id",
"fieldNames": ["id"],
"relation": "1",
"token": {
"start": {
Expand All @@ -968,7 +968,7 @@
},
{
"tableName": "products",
"fieldName": "merchant_id",
"fieldNames": ["merchant_id"],
"relation": "*",
"token": {
"start": {
Expand Down Expand Up @@ -1002,7 +1002,7 @@
"endpoints": [
{
"tableName": "users",
"fieldName": "id",
"fieldNames": ["id"],
"relation": "1",
"token": {
"start": {
Expand All @@ -1019,7 +1019,7 @@
},
{
"tableName": "merchants",
"fieldName": "admin_id",
"fieldNames": ["admin_id"],
"relation": "*",
"token": {
"start": {
Expand Down
24 changes: 12 additions & 12 deletions packages/dbml-core/__tests__/model_exporter/dbml_exporter/input/general_schema.in.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@
"endpoints": [
{
"tableName": "orders",
"fieldName": "id",
"fieldNames": ["id"],
"relation": "1",
"token": {
"start": {
Expand All @@ -764,7 +764,7 @@
},
{
"tableName": "order_items",
"fieldName": "order_id",
"fieldNames": ["order_id"],
"relation": "*",
"token": {
"start": {
Expand Down Expand Up @@ -798,7 +798,7 @@
"endpoints": [
{
"tableName": "products",
"fieldName": "id",
"fieldNames": ["id"],
"relation": "1",
"token": {
"start": {
Expand All @@ -815,7 +815,7 @@
},
{
"tableName": "order_items",
"fieldName": "product_id",
"fieldNames": ["product_id"],
"relation": "*",
"token": {
"start": {
Expand Down Expand Up @@ -849,7 +849,7 @@
"endpoints": [
{
"tableName": "countries",
"fieldName": "code",
"fieldNames": ["code"],
"relation": "1",
"token": {
"start": {
Expand All @@ -866,7 +866,7 @@
},
{
"tableName": "users",
"fieldName": "country_code",
"fieldNames": ["country_code"],
"relation": "*",
"token": {
"start": {
Expand Down Expand Up @@ -900,7 +900,7 @@
"endpoints": [
{
"tableName": "countries",
"fieldName": "code",
"fieldNames": ["code"],
"relation": "1",
"token": {
"start": {
Expand All @@ -917,7 +917,7 @@
},
{
"tableName": "merchants",
"fieldName": "country_code",
"fieldNames": ["country_code"],
"relation": "*",
"token": {
"start": {
Expand Down Expand Up @@ -951,7 +951,7 @@
"endpoints": [
{
"tableName": "merchants",
"fieldName": "id",
"fieldNames": ["id"],
"relation": "1",
"token": {
"start": {
Expand All @@ -968,7 +968,7 @@
},
{
"tableName": "products",
"fieldName": "merchant_id",
"fieldNames": ["merchant_id"],
"relation": "*",
"token": {
"start": {
Expand Down Expand Up @@ -1002,7 +1002,7 @@
"endpoints": [
{
"tableName": "users",
"fieldName": "id",
"fieldNames": ["id"],
"relation": "1",
"token": {
"start": {
Expand All @@ -1019,7 +1019,7 @@
},
{
"tableName": "merchants",
"fieldName": "admin_id",
"fieldNames": ["admin_id"],
"relation": "*",
"token": {
"start": {
Expand Down
Loading