Setup integrations tests for MySQL and MSSQL

.env.test

@@ -1,3 +1,3 @@
 NODE_ENV=test
-MSSQL_CREDENTIALS:Server=mssql,1433;Database=master;User Id=sa;Password=Pass@word;trustServerCertificate=true;
-MSSQL_CREDENTIALS_READ_ONLY:Server=mssql,1433;Database=master;User Id=reader;Password=re@derP@ssw0rd;trustServerCertificate=true;
+MYSQL_TEST_CREDENTIALS={"user":"root","host":"mysql","port":3306,"database":"mysql","ssl":"disabled"}
+MSSQL_CREDENTIALS:Server=mssql,1433;Database=master;User Id=sa;Password=Pass@word;trustServerCertificate=true;

.eslintrc.js → .eslintrc.cjs

@@ -1,7 +1,7 @@
 module.exports = {
   parserOptions: {
     sourceType: "module",
-    ecmaVersion: 2018
+    ecmaVersion: 2022
   },
   env: {
     node: true,

.github/workflows/test.yml

@@ -0,0 +1,45 @@
+name: Test
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    defaults:
+      run:
+        working-directory: .
+    env:
+      DOCKER_PACKAGE: ghcr.io/${{ github.repository }}/database-proxy_test
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Docker login
+        run: echo ${GITHUB_TOKEN} | docker login -u ${GITHUB_ACTOR} --password-stdin ghcr.io
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Republish
+        id: republish
+        continue-on-error: true
+        if: ${{ needs.Changes.outputs.connector == 'false' }}
+        run: |
+          ../.github/retry docker pull ${DOCKER_PACKAGE}:${{ github.event.before }}
+          docker tag ${DOCKER_PACKAGE}:${{ github.event.before }} ${DOCKER_PACKAGE}:${GITHUB_SHA}
+          ../.github/retry docker push ${DOCKER_PACKAGE}:${GITHUB_SHA}
+
+      - name: Build
+        if: ${{ steps.republish.outcome != 'success' }}
+        run: docker-compose build
+      - name: Lint
+        if: ${{ steps.republish.outcome != 'success' }}
+        run: docker-compose run lint
+      - name: Test
+        if: ${{ steps.republish.outcome != 'success' }}
+        run: docker-compose run test
+      - name: Container logs
+        if: failure()
+        run: docker-compose logs --no-color --timestamps
+      - name: Publish
+        if: ${{ steps.republish.outcome != 'success' }}
+        run: |
+          docker tag database-proxy_test:latest ${DOCKER_PACKAGE}:${GITHUB_SHA}
+          ../.github/retry docker push ${DOCKER_PACKAGE}:${GITHUB_SHA}

Dockerfile

@@ -1,5 +1,7 @@
 FROM node:18.12.1-alpine
 
+RUN apk update && apk --no-cache add git
+
 RUN mkdir /app
 WORKDIR /app
 

docker-compose.local.yml

@@ -3,5 +3,5 @@ version: "3.7"
 services:
   mssql:
     image: mcr.microsoft.com/azure-sql-edge
-    expose:
-      - "1433"
+    ports:
+      - "1433:1433"

docker-compose.yml

@@ -1,15 +1,20 @@
 version: "3.7"
 
 services:
+  lint:
+    build: .
+    command: eslint .
+
   test:
     build: .
     depends_on:
       - mssql
+      - mysql
     env_file:
       - .env.test
     networks:
       - db_proxy_test
-    command: sh -c "set -o pipefail && wait-on -d 10000 -t 30000 tcp:mssql:1433 && node ./data/seed.mssql.js && TZ=UTC NODE_ENV=TEST node_modules/.bin/mocha"
+    command: sh -c "set -o pipefail && wait-on -d 15000 -t 30000 tcp:mysql:3306 tcp:mssql:1433 && node ./data/seed.mssql.js && TZ=UTC NODE_ENV=TEST node_modules/.bin/mocha"
 
   mssql:
     image: mcr.microsoft.com/mssql/server:2019-latest
@@ -20,8 +25,13 @@ services:
       - MSSQL_SLEEP=7
     volumes:
       - ./data/AdventureWorks2019.bak:/var/opt/mssql/backup/test.bak
-    ports:
-      - "1433:1433"
+    networks:
+      - db_proxy_test
+
+  mysql:
+    image: mariadb:10.6.4
+    environment:
+      - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=yes
     networks:
       - db_proxy_test
 

lib/databricks.js

@@ -253,14 +253,14 @@ export async function queryStream(req, res, connection) {
     res.write(`${JSON.stringify(responseSchema)}`);
     res.write("\n");
 
-    await new Promise(async (resolve, reject) => {
+    await new Promise((resolve, reject) => {
       const stream = new Readable.from(rows);
 
       stream.once("data", () => {
         clearInterval(keepAlive);
       });
 
-      stream.on("close", (error) => {
+      stream.on("close", () => {
         resolve();
         stream.destroy();
       });
@@ -345,8 +345,6 @@ export async function check(req, res, connection) {
     });
 
     return {ok: true};
-  } catch (e) {
-    throw e;
   } finally {
     if (connection) {
       try {

lib/oracle.js

@@ -204,8 +204,6 @@ export async function check(req, res, pool) {
       );
 
     return {ok: true};
-  } catch (e) {
-    throw e;
   } finally {
     if (connection) {
       try {

package.json

@@ -36,10 +36,13 @@
     "@babel/preset-env": "^7.19.4",
     "@babel/register": "^7.18.9",
     "chai": "^4.3.6",
+    "eslint": "^8.32.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^10.1.0",
     "mock-req": "^0.2.0",
     "mock-res": "^0.6.0",
     "nodemon": "^1.19.1",
+    "prettier": "^2.8.3",
     "wait-on": "^6.0.1"
   },
   "peerDependencies": {
@@ -51,7 +54,7 @@
     "test": "mocha",
     "test:local": "docker-compose -f docker-compose.yml -f docker-compose.local.yml up --build",
     "test:ci": "docker-compose -f docker-compose.yml up --build --exit-code-from test",
-    "test:db": "docker-compose -f docker-compose.yml -f docker-compose.local.yml up mssql"
+    "test:db": "docker-compose -f docker-compose.yml -f docker-compose.local.yml up mssql mysql"
   },
   "author": "Observable",
   "license": "ISC",

test/mssql.test.js

@@ -32,7 +32,7 @@ describe("mssql", () => {
 
   describe("when querying", () => {
     it("should stream the results of simple query", () => {
-      return new Promise(async (resolve, reject) => {
+      return new Promise((resolve) => {
         const req = new MockReq({method: "POST", url: "/query-stream"}).end({
           sql: "SELECT TOP 2 CustomerID FROM test.SalesLT.Customer",
           params: [],
@@ -41,7 +41,7 @@ describe("mssql", () => {
         const res = new MockRes(onEnd);
 
         const index = mssql(credentials);
-        await index(req, res);
+        index(req, res);
 
         function onEnd() {
           const [schema, row] = this._getString().split("\n");
@@ -62,17 +62,18 @@ describe("mssql", () => {
       });
     });
     it("should handle parameter graciously", () => {
-      return new Promise(async (resolve, reject) => {
+      return new Promise((resolve) => {
         const testCustomerId = 3;
         const req = new MockReq({method: "POST", url: "/query-stream"}).end({
-          sql: "SELECT TOP 2 CustomerID FROM test.SalesLT.Customer WHERE CustomerID=@1",
+          sql:
+            "SELECT TOP 2 CustomerID FROM test.SalesLT.Customer WHERE CustomerID=@1",
           params: [testCustomerId],
         });
 
         const res = new MockRes(onEnd);
 
         const index = mssql(credentials);
-        await index(req, res);
+        index(req, res);
 
         function onEnd() {
           const [schema, row] = this._getString().split("\n");
@@ -93,17 +94,18 @@ describe("mssql", () => {
       });
     });
     it("should replace cell reference in the SQL query", () => {
-      return new Promise(async (resolve, reject) => {
+      return new Promise((resolve) => {
         const testCustomerId = 5;
         const req = new MockReq({method: "POST", url: "/query-stream"}).end({
-          sql: "SELECT TOP 2 CustomerID FROM test.SalesLT.Customer WHERE CustomerID=@1",
+          sql:
+            "SELECT TOP 2 CustomerID FROM test.SalesLT.Customer WHERE CustomerID=@1",
           params: [testCustomerId],
         });
 
         const res = new MockRes(onEnd);
 
         const index = mssql(credentials);
-        await index(req, res);
+        index(req, res);
 
         function onEnd() {
           const [schema, row] = this._getString().split("\n");
@@ -124,7 +126,7 @@ describe("mssql", () => {
       });
     });
     it("should handle duplicated column names", () => {
-      return new Promise(async (resolve, reject) => {
+      return new Promise((resolve) => {
         const req = new MockReq({method: "POST", url: "/query-stream"}).end({
           sql: "SELECT 1 as _a1, 2 as _a1 FROM test.SalesLT.SalesOrderDetail",
           params: [],
@@ -133,10 +135,10 @@ describe("mssql", () => {
         const res = new MockRes(onEnd);
 
         const index = mssql(credentials);
-        await index(req, res);
+        index(req, res);
 
         function onEnd() {
-          const [schema, row] = this._getString().split("\n");
+          const [, row] = this._getString().split("\n");
 
           expect(row).to.equal(
             JSON.stringify({
@@ -149,16 +151,17 @@ describe("mssql", () => {
       });
     });
     it("should select the last value of any detected duplicated columns", () => {
-      return new Promise(async (resolve, reject) => {
+      return new Promise((resolve) => {
         const req = new MockReq({method: "POST", url: "/query-stream"}).end({
-          sql: "SELECT TOP 1 ModifiedDate, ModifiedDate FROM test.SalesLT.SalesOrderDetail",
+          sql:
+            "SELECT TOP 1 ModifiedDate, ModifiedDate FROM test.SalesLT.SalesOrderDetail",
           params: [],
         });
 
         const res = new MockRes(onEnd);
 
         const index = mssql(credentials);
-        await index(req, res);
+        index(req, res);
 
         function onEnd() {
           const [schema, row] = this._getString().split("\n");