bidirectional relationships, many to one

2021-07-01 22:23:47 +01:00 · 2021-07-01 22:23:47 +01:00 · 3eb8f3c445
parent cae1a20411 bc4c85bffa
commit 3eb8f3c445
10 changed files with 551 additions and 407 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -75,6 +75,28 @@
        "design"
      ]
    },
+    {
+      "login": "Rory-Powell",
+      "name": "Rory Powell",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8755148?v=4",
+      "profile": "https://github.com/Rory-Powell",
+      "contributions": [
+        "code",
+        "doc",
+        "test"
+      ]
+    },
+    {
+      "login": "PClmnt",
+      "name": "Peter Clement",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5665926?v=4",
+      "profile": "https://github.com/PClmnt",
+      "contributions": [
+        "code",
+        "doc",
+        "test"
+      ]
+    },
    {
      "login": "Conor-Mack",
      "name": "Conor_Mack",
--- a/.github/AUTHORS.md
+++ b/.github/AUTHORS.md
@ -7,3 +7,5 @@ Contributors
 * Martin McKeaveney - [@shogunpurple](https://github.com/shogunpurple)
 * Andrew Kingston - [@aptkingston](https://github.com/aptkingston)
 * Michael Drury - [@mike12345567](https://github.com/mike12345567)
+* Peter Clement - [@PClmnt](https://github.com/PClmnt)
+* Rory Powell - [@Rory-Powell](https://github.com/Rory-Powell)
--- a/README.md
+++ b/README.md
@ -211,9 +211,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
    <td align="center"><a href="https://budibase.com/"><img src="https://avatars3.githubusercontent.com/u/3524181?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael Shanks</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=mjashanks" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://github.com/kevmodrome"><img src="https://avatars3.githubusercontent.com/u/534488?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Åberg Kultalahti</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=kevmodrome" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://www.budibase.com/"><img src="https://avatars2.githubusercontent.com/u/49767913?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joe</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=joebudi" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=joebudi" title="Code">💻</a> <a href="#content-joebudi" title="Content">🖋</a> <a href="#design-joebudi" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/Conor-Mack"><img src="https://avatars1.githubusercontent.com/u/36074859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Conor_Mack</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=Conor-Mack" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=Conor-Mack" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/Rory-Powell"><img src="https://avatars.githubusercontent.com/u/8755148?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rory Powell</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=Rory-Powell" title="Tests">⚠️</a></td>
  </tr>
  <tr>
+    <td align="center"><a href="https://github.com/PClmnt"><img src="https://avatars.githubusercontent.com/u/5665926?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Peter Clement</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=PClmnt" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=PClmnt" title="Documentation">📖</a> <a href="https://github.com/Budibase/budibase/commits?author=PClmnt" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/Conor-Mack"><img src="https://avatars1.githubusercontent.com/u/36074859?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Conor_Mack</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=Conor-Mack" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=Conor-Mack" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://github.com/pngwn"><img src="https://avatars1.githubusercontent.com/u/12937446?v=4?s=100" width="100px;" alt=""/><br /><sub><b>pngwn</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=pngwn" title="Code">💻</a> <a href="https://github.com/Budibase/budibase/commits?author=pngwn" title="Tests">⚠️</a></td>
    <td align="center"><a href="https://github.com/HugoLd"><img src="https://avatars0.githubusercontent.com/u/26521848?v=4?s=100" width="100px;" alt=""/><br /><sub><b>HugoLd</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=HugoLd" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/victoriasloan"><img src="https://avatars.githubusercontent.com/u/9913651?v=4?s=100" width="100px;" alt=""/><br /><sub><b>victoriasloan</b></sub></a><br /><a href="https://github.com/Budibase/budibase/commits?author=victoriasloan" title="Code">💻</a></td>
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
@ -43,6 +43,7 @@
    // source of relationship
    datasource.entities[from.name].schema[relationship.name] = {
      type: "link",
+      foreignKey: relationship.fieldName,
      ...relationship
    }
    // save other side of relationship in the other schema
@ -52,7 +53,7 @@
      relationshipType: manyToMany ? RelationshipTypes.MANY_TO_MANY : RelationshipTypes.MANY_TO_ONE,
      tableId: from._id,
      fieldName: relationship.fieldName,
-      foreignKey: relationship.foreignKey
+      foreignKey: relationship.fieldName
    }

    // If relationship has been renamed
@ -113,13 +114,19 @@
        options={tableOptions}
        bind:value={relationship.through}
      />
+
+      <Select 
+        label={"Key"}
+        options={Object.keys(through.schema || {})}
+        bind:value={relationship.fieldName}
+      />
    {/if}

    {#if relationship?.relationshipType === RelationshipTypes.ONE_TO_MANY && to}
      <Select 
        label={`Foreign Key (${to.name})`}
        options={Object.keys(to.schema)}
-        bind:value={relationship.foreignKey}
+        bind:value={relationship.fieldName}
      />
    {/if}
  </div>
@ -136,11 +143,7 @@
 <style>
  .table-selector {
    display: grid;
-    grid-template-columns: repeat(4, 1fr);
+    grid-template-columns: repeat(5, 1fr);
    grid-gap: var(--spacing-xl);
  }
-
-  .cardinality {
-    padding: 10px;
-  }
 </style>
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
@ -67,9 +67,7 @@
  }

  function openRelationshipModal(relationship) {
-    if (relationship.type === "link") {
-      selectedRelationship = relationship
-    }
+    selectedRelationship = relationship || {}
    relationshipModal.show()
  }

@ -146,7 +144,7 @@
                <Divider />
        <div class="query-header">
          <Heading size="S">Relationships</Heading>
-          <Button primary on:click={openRelationshipModal}>Create Relationship</Button>
+          <Button primary on:click={() => openRelationshipModal()}>Create Relationship</Button>
        </div>
          <Body>
            Tell budibase how your tables are related to get even more smart features.
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -24,7 +24,7 @@
    "docker-compose": "^0.23.6",
    "inquirer": "^8.0.0",
    "lookpath": "^1.1.0",
-    "pkg": "^4.4.9",
+    "pkg": "^5.3.0",
    "posthog-node": "1.0.7",
    "randomstring": "^1.1.5"
  },
--- a/packages/cli/yarn.lock
+++ b/packages/cli/yarn.lock
--- a/packages/server/.vscode/launch.json
+++ b/packages/server/.vscode/launch.json
@ -5,13 +5,13 @@
    "version": "0.2.0",
    "configurations": [
      {
+        "name": "Start Server",
        "type": "node",
        "request": "launch",
-        "name": "Start Server",
-        "sourceMaps": true,
-        "program": "${workspaceFolder}/src/index.ts",
-        "preLaunchTask": "npm: build",
-        "outFiles": ["${workspaceFolder}/dist/**/*.js"]
+        "runtimeExecutable": "node",
+        "runtimeArgs": ["--nolazy", "-r", "ts-node/register/transpile-only"],
+        "args": ["src/index.ts"],
+        "cwd": "${workspaceRoot}",
      },
      {
        "type": "node",
--- a/packages/server/src/api/controllers/datasource.js
+++ b/packages/server/src/api/controllers/datasource.js
@ -48,7 +48,7 @@ exports.buildSchemaFromDb = async function (ctx) {

  // Connect to the DB and build the schema
  const connector = new Connector(datasource.config)
-  await connector.buildSchema(datasource._id)
+  await connector.buildSchema(datasource._id, datasource.entities)
  datasource.entities = connector.tables

  const response = await db.post(datasource)
--- a/packages/server/src/integrations/postgres.ts
+++ b/packages/server/src/integrations/postgres.ts
@ -179,10 +179,6 @@ module PostgresModule {
                tables[tableName].schema[key] = existingTableSchema[key]
              }
            }
-            console.log({
-              existingTableSchema,
-              tables
-            })
          }
        }