From f45969f5d316897373d70d2af228a6ffcad25526 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 27 May 2021 12:38:27 +0200 Subject: [PATCH] try to connect --- .github/workflows/integration-tests.yaml | 46 +++++------ integration-tests/engines.js | 100 +++++++++++------------ integration-tests/package.json | 2 +- 3 files changed, 74 insertions(+), 74 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index f62c3ee5..57b03f5c 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -31,29 +31,29 @@ jobs: env: POSTGRES_PASSWORD: Pwd2020Db ports: - - 15000:5432 + - 5432:5432 - mysql: - image: mysql - # options: >- - # --default-authentication-plugin=mysql_native_password - ports: - - 15001:3306 - env: - MYSQL_ROOT_PASSWORD: Pwd2020Db + # mysql: + # image: mysql + # # options: >- + # # --default-authentication-plugin=mysql_native_password + # ports: + # - 15001:3306 + # env: + # MYSQL_ROOT_PASSWORD: Pwd2020Db - mssql: - image: mcr.microsoft.com/mssql/server - ports: - - 15002:1433 - env: - ACCEPT_EULA: Y - SA_PASSWORD: Pwd2020Db - MSSQL_PID: Express + # mssql: + # image: mcr.microsoft.com/mssql/server + # ports: + # - 15002:1433 + # env: + # ACCEPT_EULA: Y + # SA_PASSWORD: Pwd2020Db + # MSSQL_PID: Express - cockroachdb: - image: cockroachdb/cockroach - ports: - - 15003:26257 - # options: >- - # start-single-node --insecure + # cockroachdb: + # image: cockroachdb/cockroach + # ports: + # - 15003:26257 + # # options: >- + # # start-single-node --insecure diff --git a/integration-tests/engines.js b/integration-tests/engines.js index 268690b4..6f7d1498 100644 --- a/integration-tests/engines.js +++ b/integration-tests/engines.js @@ -7,17 +7,17 @@ const views = { }; const engines = [ - { - label: 'MySQL', - connection: { - engine: 'mysql@dbgate-plugin-mysql', - server: 'localhost', - password: 'Pwd2020Db', - user: 'root', - port: 15001, - }, - objects: [views], - }, + // { + // label: 'MySQL', + // connection: { + // engine: 'mysql@dbgate-plugin-mysql', + // server: 'localhost', + // password: 'Pwd2020Db', + // user: 'root', + // port: 15001, + // }, + // objects: [views], + // }, { label: 'PostgreSQL', connection: { @@ -25,7 +25,7 @@ const engines = [ server: 'localhost', password: 'Pwd2020Db', user: 'postgres', - port: 15000, + port: 5432, }, objects: [ views, @@ -38,44 +38,44 @@ const engines = [ }, ], }, - { - label: 'SQL Server', - connection: { - engine: 'mssql@dbgate-plugin-mssql', - server: 'localhost', - password: 'Pwd2020Db', - user: 'sa', - port: 15002, - }, - objects: [ - views, - { - type: 'procedures', - create1: 'CREATE PROCEDURE obj1 AS SELECT id FROM t1', - create2: 'CREATE PROCEDURE obj2 AS SELECT id FROM t2', - drop1: 'DROP PROCEDURE obj1', - drop2: 'DROP PROCEDURE obj2', - }, - ], - }, - { - label: 'SQLite', - generateDbFile: true, - connection: { - engine: 'sqlite@dbgate-plugin-sqlite', - }, - objects: [views], - }, - { - label: 'CockroachDB', - connection: { - engine: 'cockroach@dbgate-plugin-postgres', - server: 'localhost', - user: 'root', - port: 15003, - }, - objects: [views], - }, + // { + // label: 'SQL Server', + // connection: { + // engine: 'mssql@dbgate-plugin-mssql', + // server: 'localhost', + // password: 'Pwd2020Db', + // user: 'sa', + // port: 15002, + // }, + // objects: [ + // views, + // { + // type: 'procedures', + // create1: 'CREATE PROCEDURE obj1 AS SELECT id FROM t1', + // create2: 'CREATE PROCEDURE obj2 AS SELECT id FROM t2', + // drop1: 'DROP PROCEDURE obj1', + // drop2: 'DROP PROCEDURE obj2', + // }, + // ], + // }, + // { + // label: 'SQLite', + // generateDbFile: true, + // connection: { + // engine: 'sqlite@dbgate-plugin-sqlite', + // }, + // objects: [views], + // }, + // { + // label: 'CockroachDB', + // connection: { + // engine: 'cockroach@dbgate-plugin-postgres', + // server: 'localhost', + // user: 'root', + // port: 15003, + // }, + // objects: [views], + // }, ]; module.exports = engines; diff --git a/integration-tests/package.json b/integration-tests/package.json index 83c819b2..dbb788a0 100644 --- a/integration-tests/package.json +++ b/integration-tests/package.json @@ -10,7 +10,7 @@ "license": "MIT", "scripts": { "wait": "cross-env DEVMODE=1 node wait.js", - "test": "cross-env DEVMODE=1 jest --runInBand", + "test": "cross-env DEVMODE=1 jest", "run:local": "docker-compose down && docker-compose up -d && yarn wait && yarn test" }, "devDependencies": {