From 32e894d406be63946662ed2e18bcbcb3c24f46ae Mon Sep 17 00:00:00 2001 From: Artem Danilov Date: Thu, 27 Mar 2025 09:20:04 +0300 Subject: [PATCH 1/4] Run test for postgres 11 --- .github/workflows/main.yaml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index dab017a..8ce5121 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,7 +9,16 @@ jobs: container: library/node:16-alpine services: - postgres: + postgres-11: + image: library/postgres:11-alpine + env: + POSTGRES_PASSWORD: postgres + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + postgres-16: image: library/postgres:16-alpine env: POSTGRES_PASSWORD: postgres @@ -32,10 +41,15 @@ jobs: - name: Install dependencies run: npm ci - - name: Run tests + - name: Run tests for postgres 11 + run: npm run test-ci + env: + CONNECTION_STRING: 'postgresql://postgres:postgres@postgres-11:5432' + + - name: Run tests for postgres 16 run: npm run test-ci env: - CONNECTION_STRING: 'postgresql://postgres:postgres@postgres:5432' + CONNECTION_STRING: 'postgresql://postgres:postgres@postgres-16:5432' - name: Generating coverage badges - uses: jpb06/jest-badges-action@latest \ No newline at end of file + uses: jpb06/jest-badges-action@latest From 0795f7a55220176c0f9386c663eaf8e01fe8a6e7 Mon Sep 17 00:00:00 2001 From: Artem Danilov Date: Thu, 27 Mar 2025 09:30:50 +0300 Subject: [PATCH 2/4] Fix view query for postgres 11 --- __tests__/data/root1/vw_2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tests__/data/root1/vw_2.js b/__tests__/data/root1/vw_2.js index e5fd031..681f244 100644 --- a/__tests__/data/root1/vw_2.js +++ b/__tests__/data/root1/vw_2.js @@ -10,6 +10,6 @@ module.exports = { wrap: true, - sql: `SELECT 'two' label, 2 id`, + sql: `SELECT 'two' AS label, 2 AS id`, } \ No newline at end of file From 960229ba67c63dd4aacc3da0eafa14020ce8111f Mon Sep 17 00:00:00 2001 From: Artem Danilov Date: Thu, 27 Mar 2025 09:31:11 +0300 Subject: [PATCH 3/4] Fix selecting trigger names for model update --- lib/DbLangPg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/DbLangPg.js b/lib/DbLangPg.js index b30c77f..0d29e2f 100644 --- a/lib/DbLangPg.js +++ b/lib/DbLangPg.js @@ -367,7 +367,7 @@ class DbLangPg extends DbLang { , trg AS ( SELECT t.event_object_table AS table_name - , JSON_AGG (DISTINCT LEFT (SUBSTRING (t.action_statement, 18), -2)) AS _trg_proc_names + , JSON_AGG (DISTINCT TRIM (LEFT (SUBSTRING (t.action_statement, 18), -2))) AS _trg_proc_names FROM information_schema.triggers t WHERE From 0495cb5583048ccb0013a77fccd3e60cda390439 Mon Sep 17 00:00:00 2001 From: Artem Danilov Date: Thu, 27 Mar 2025 09:39:09 +0300 Subject: [PATCH 4/4] ver++ --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cfb0d66..619fa73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "doix-db-postgresql", - "version": "1.0.70", + "version": "1.0.71", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "doix-db-postgresql", - "version": "1.0.70", + "version": "1.0.71", "license": "MIT", "dependencies": { "pg": "^8.13.3", diff --git a/package.json b/package.json index 3b0bddc..09cd857 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "doix-db-postgresql", - "version": "1.0.70", + "version": "1.0.71", "description": "PostgreSQL support for doix", "main": "index.js", "files": [