Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
uses: jpb06/jest-badges-action@latest
2 changes: 1 addition & 1 deletion __tests__/data/root1/vw_2.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ module.exports = {

wrap: true,

sql: `SELECT 'two' label, 2 id`,
sql: `SELECT 'two' AS label, 2 AS id`,

}
2 changes: 1 addition & 1 deletion lib/DbLangPg.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down