Merge branch 'feature/opinionated-sql' of github.com:Budibase/budibase into feature/opinionated-sql

packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js

@@ -84,7 +84,7 @@ const createScreen = table => {
     .customProps({
       dataSource: {
         label: table.name,
-        name: `all_${table._id}`,
+        name: table._id,
         tableId: table._id,
         type: "table",
       },

packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js

@@ -75,7 +75,7 @@ const createScreen = table => {
     .customProps({
       dataSource: {
         label: table.name,
-        name: `all_${table._id}`,
+        name: table._id,
         tableId: table._id,
         type: "table",
       },

packages/builder/src/components/backend/DataTable/DataTable.svelte

@@ -27,22 +27,20 @@
 
   // Fetch rows for specified table
   $: {
-    if ($views.selected?.name?.startsWith("all_")) {
-      loading = true
-      const loadingTableId = $tables.selected?._id
-      api.fetchDataForView($views.selected).then(rows => {
-        loading = false
+    loading = true
+    const loadingTableId = $tables.selected?._id
+    api.fetchDataForTable($tables.selected._id).then(rows => {
+      loading = false
 
-        // If we started a slow request then quickly change table, sometimes
-        // the old data overwrites the new data.
-        // This check ensures that we don't do that.
-        if (loadingTableId !== $tables.selected?._id) {
-          return
-        }
+      // If we started a slow request then quickly change table, sometimes
+      // the old data overwrites the new data.
+      // This check ensures that we don't do that.
+      if (loadingTableId !== $tables.selected?._id) {
+        return
+      }
 
-        data = rows || []
-      })
-    }
+      data = rows || []
+    })
   }
 </script>
 

packages/builder/src/components/backend/DataTable/ViewDataTable.svelte

@@ -20,10 +20,8 @@
 
   // Fetch rows for specified view
   $: {
-    if (!name.startsWith("all_")) {
-      loading = true
-      fetchViewData(name, view.field, view.groupBy, view.calculation)
-    }
+    loading = true
+    fetchViewData(name, view.field, view.groupBy, view.calculation)
   }
 
   async function fetchViewData(name, field, groupBy, calculation) {
@@ -32,6 +30,7 @@
     const thisView = allTableViews.filter(
       views => views != null && views[name] != null
     )[0]
+
     // don't fetch view data if the view no longer exists
     if (!thisView) {
       return

packages/builder/src/components/backend/DataTable/api.js

@@ -21,8 +21,8 @@ export async function deleteRow(row) {
   })
 }
 
-export async function fetchDataForView(view) {
-  const FETCH_ROWS_URL = `/api/views/${view.name}`
+export async function fetchDataForTable(tableId) {
+  const FETCH_ROWS_URL = `/api/${tableId}/rows`
 
   const response = await api.get(FETCH_ROWS_URL)
   const json = await response.json()

packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte

@@ -36,7 +36,7 @@
         border={idx > 0}
         icon={table._id === TableNames.USERS ? "UserGroup" : "Table"}
         text={table.name}
-        selected={selectedView === `all_${table._id}`}
+        selected={selectedView === table._id}
         on:click={() => selectTable(table)}
       >
         {#if table._id !== TableNames.USERS}

packages/builder/src/stores/backend/tables.js

@@ -25,7 +25,7 @@ export function createTablesStore() {
         selected: table,
         draft: cloneDeep(table),
       }))
-      views.select({ name: `all_${table._id}` })
+      views.select({ name: table._id })
     }
   }
 

packages/builder/src/stores/backend/tests/tables.spec.js

@@ -46,7 +46,7 @@ describe("Tables Store", () => {
     await store.select(tableToSelect)
   
     expect(get(store).selected).toEqual(tableToSelect) 
-    expect(get(views).selected).toEqual({ name: `all_${tableToSelect._id}` })
+    expect(get(views).selected).toEqual({ name: tableToSelect._id })
   })
 
   it("saving a table also selects it", async () => {

packages/server/src/api/controllers/row/external.js

@@ -127,9 +127,11 @@ exports.bulkDestroy = async ctx => {
   // TODO: this can probably be optimised to a single SQL statement in the future
   let promises = []
   for (let row of rows) {
-    promises.push(handleRequest(appId, DataSourceOperation.DELETE, tableId, {
-      id: row._id,
-    }))
+    promises.push(
+      handleRequest(appId, DataSourceOperation.DELETE, tableId, {
+        id: row._id,
+      })
+    )
   }
   await Promise.all(promises)
   return { response: { ok: true }, rows }

packages/server/src/api/routes/tests/row.spec.js

@@ -309,7 +309,7 @@ describe("/rows", () => {
     it("should be able to fetch tables contents via 'view'", async () => {
       const row = await config.createRow()
       const res = await request
-        .get(`/api/views/all_${table._id}`)
+        .get(`/api/views/${table._id}`)
         .set(config.defaultHeaders())
         .expect('Content-Type', /json/)
         .expect(200)

packages/server/src/integrations/plus/postgres.js

@@ -2,6 +2,7 @@ const Sql = require("../base/sql")
 const { Pool } = require("pg")
 const { FieldTypes } = require("../../constants")
 const { FIELD_TYPES } = require("../Integration")
+const { SEPARATOR } = require("@budibase/auth/db")
 
 const TYPE_MAP = {
   text: FieldTypes.LONGFORM,
@@ -60,7 +61,7 @@ class PostgresPlus extends Sql {
     "select * from information_schema.columns where table_schema = 'public'"
 
   PRIMARY_KEYS_SQL = `
-    select tc.table_schema, tc.table_name, tc.column_name, kc.column_name as primary_key 
+    select tc.table_schema, tc.table_name, kc.column_name as primary_key 
     from information_schema.table_constraints tc
     join 
       information_schema.key_column_usage kc on kc.table_name = tc.table_name 
@@ -69,9 +70,11 @@ class PostgresPlus extends Sql {
     where tc.constraint_type = 'PRIMARY KEY';
   `
 
-  constructor(config) {
+  constructor(config, datasource) {
     super("pg")
     this.config = config
+    this.datasource = datasource
+
     if (!this.pool) {
       this.pool = new Pool(this.config)
     }
@@ -101,7 +104,8 @@ class PostgresPlus extends Sql {
       // table key doesn't exist yet
       if (!tables[tableName]) {
         tables[tableName] = {
-          _id: `${datasourceId}_${tableName}`,
+          _id: `${datasourceId}${SEPARATOR}${tableName}`,
+          // TODO: this needs to accommodate composite keys
           primary: keys,
           name: tableName,
           schema: {},