fix up datasources and server tests

packages/builder/cypress/support/commands.js

@@ -37,7 +37,7 @@ Cypress.Commands.add("createApp", name => {
       cy.contains("Create app").click()
     })
     .then(() => {
-      cy.get("[data-cy=new-table]", {
+      cy.contains("Budibase DB", {
         timeout: 20000,
       }).should("be.visible")
     })
@@ -72,7 +72,8 @@ Cypress.Commands.add("createTestTableWithData", () => {
 
 Cypress.Commands.add("createTable", tableName => {
   // Enter table name
-  cy.get("[data-cy=new-table]").click()
+  cy.get("Budibase DB")
+  cy.contains("Create new table").click()
   cy.get(".spectrum-Modal").within(() => {
     cy.get("input").first().type(tableName).blur()
     cy.get(".spectrum-ButtonGroup").contains("Create").click()

packages/server/__mocks__/mysql.js

@@ -2,7 +2,7 @@ const mysql = {}
 
 const client = {
   connect: jest.fn(),
-  query: jest.fn((query, fn) => {
+  query: jest.fn((query, bindings, fn) => {
     fn(null, [])
   }),
 }

packages/server/src/integrations/microsoftSqlServer.js

@@ -85,25 +85,25 @@ class SqlServerIntegration extends Sql {
 
   async read(query) {
     await this.connect()
-    const response = await internalQuery(this.client, query.sql)
+    const response = await internalQuery(this.client, query)
     return response.recordset
   }
 
   async create(query) {
     await this.connect()
-    const response = await internalQuery(this.client, query.sql)
+    const response = await internalQuery(this.client, query)
     return response.recordset || [{ created: true }]
   }
 
   async update(query) {
     await this.connect()
-    const response = await internalQuery(this.client, query.sql)
+    const response = await internalQuery(this.client, query)
     return response.recordset || [{ updated: true }]
   }
 
   async delete(query) {
     await this.connect()
-    const response = await internalQuery(this.client, query.sql)
+    const response = await internalQuery(this.client, query)
     return response.recordset || [{ deleted: true }]
   }
 

packages/server/src/integrations/mysql.js

@@ -79,21 +79,21 @@ class MySQLIntegration extends Sql {
   }
 
   async create(query) {
-    const results = await internalQuery(this.client, query.sql)
+    const results = await internalQuery(this.client, query)
     return results.length ? results : [{ created: true }]
   }
 
   read(query) {
-    return internalQuery(this.client, query.sql)
+    return internalQuery(this.client, query)
   }
 
   async update(query) {
-    const results = await internalQuery(this.client, query.sql)
+    const results = await internalQuery(this.client, query)
     return results.length ? results : [{ updated: true }]
   }
 
   async delete(query) {
-    const results = await internalQuery(this.client, query.sql)
+    const results = await internalQuery(this.client, query)
     return results.length ? results : [{ deleted: true }]
   }
 

packages/server/src/integrations/postgres.js

@@ -168,7 +168,7 @@ class PostgresIntegration extends Sql {
     return response.rows.length ? response.rows : [{ updated: true }]
   }
 
-  async delete({ sql }) {
+  async delete(sql) {
     const response = await internalQuery(this.client, sql)
     return response.rows.length ? response.rows : [{ deleted: true }]
   }

packages/server/src/integrations/tests/microsoftSqlServer.spec.js

@@ -20,7 +20,7 @@ describe("MS SQL Server Integration", () => {
     const response = await config.integration.create({ 
       sql
     })
-    expect(config.integration.client.query).toHaveBeenCalledWith(sql)
+    expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined)
   })
 
   it("calls the read method with the correct params", async () => {
@@ -28,7 +28,7 @@ describe("MS SQL Server Integration", () => {
     const response = await config.integration.read({ 
       sql
     })
-    expect(config.integration.client.query).toHaveBeenCalledWith(sql)
+    expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined)
   })
 
   describe("no rows returned", () => {

packages/server/src/integrations/tests/mysql.spec.js

@@ -19,7 +19,7 @@ describe("MySQL Integration", () => {
     await config.integration.create({
       sql
     })
-    expect(config.integration.client.query).toHaveBeenCalledWith(sql, expect.any(Function))
+    expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined, expect.any(Function))
   })
 
   it("calls the read method with the correct params", async () => {
@@ -27,7 +27,7 @@ describe("MySQL Integration", () => {
     await config.integration.read({
       sql
     })
-    expect(config.integration.client.query).toHaveBeenCalledWith(sql, expect.any(Function))
+    expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined, expect.any(Function))
   })
 
   it("calls the update method with the correct params", async () => {
@@ -35,7 +35,7 @@ describe("MySQL Integration", () => {
     await config.integration.update({
       sql
     })
-    expect(config.integration.client.query).toHaveBeenCalledWith(sql, expect.any(Function))
+    expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined, expect.any(Function))
   })
 
   it("calls the delete method with the correct params", async () => {
@@ -43,7 +43,7 @@ describe("MySQL Integration", () => {
     await config.integration.delete({
       sql
     })
-    expect(config.integration.client.query).toHaveBeenCalledWith(sql, expect.any(Function))
+    expect(config.integration.client.query).toHaveBeenCalledWith(sql, undefined, expect.any(Function))
   })
 
   describe("no rows returned", () => {

packages/server/src/integrations/tests/postgres.spec.js

@@ -20,7 +20,7 @@ describe("Postgres Integration", () => {
     const response = await config.integration.create({ 
       sql
     })
-    expect(pg.queryMock).toHaveBeenCalledWith(sql)
+    expect(pg.queryMock).toHaveBeenCalledWith(sql, undefined)
   })
 
   it("calls the read method with the correct params", async () => {
@@ -28,7 +28,7 @@ describe("Postgres Integration", () => {
     const response = await config.integration.read({ 
       sql
     })
-    expect(pg.queryMock).toHaveBeenCalledWith(sql)
+    expect(pg.queryMock).toHaveBeenCalledWith(sql, undefined)
   })
 
   it("calls the update method with the correct params", async () => {
@@ -36,7 +36,7 @@ describe("Postgres Integration", () => {
     const response = await config.integration.update({ 
       sql
     })
-    expect(pg.queryMock).toHaveBeenCalledWith(sql)
+    expect(pg.queryMock).toHaveBeenCalledWith(sql, undefined)
   })
 
   it("calls the delete method with the correct params", async () => {
@@ -44,7 +44,7 @@ describe("Postgres Integration", () => {
     await config.integration.delete({
       sql
     })
-    expect(pg.queryMock).toHaveBeenCalledWith(sql)
+    expect(pg.queryMock).toHaveBeenCalledWith(sql, undefined)
   })
 
   describe("no rows returned", () => {