Skip to content

Commit 05ebccd

Browse files
lognaturelktuite
andauthored
Use postgres 14 (#773)
* Use postgres 14 * Make run-docker-postgres in makefile use postgres 14 * Update postgres image in soak test * Update link to trigram concept in api docs to postgres14 --------- Co-authored-by: Kathleen Tuite <kathleen.tuite@gmail.com>
1 parent da0926d commit 05ebccd

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jobs:
33
build:
44
docker:
55
- image: cimg/node:16.19.1
6-
- image: cimg/postgres:9.6
6+
- image: cimg/postgres:14.6
77
environment:
88
POSTGRES_PASSWORD: odktest
99

.github/workflows/soak-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
services:
1313
# see: https://docs.github.com/en/enterprise-server@3.5/actions/using-containerized-services/creating-postgresql-service-containers
1414
postgres:
15-
image: postgres:9.6
15+
image: postgres:14.6
1616
env:
1717
POSTGRES_PASSWORD: odktest
1818
ports:

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ lint: node_version
5252

5353
.PHONY: run-docker-postgres
5454
run-docker-postgres: stop-docker-postgres
55-
docker start odk-postgres || (docker run -d --name odk-postgres -p 5432:5432 -e POSTGRES_PASSWORD=odktest postgres:9.6 && sleep 5 && node lib/bin/create-docker-databases.js)
55+
docker start odk-postgres14 || (docker run -d --name odk-postgres14 -p 5432:5432 -e POSTGRES_PASSWORD=odktest postgres:14.6 && sleep 5 && node lib/bin/create-docker-databases.js)
5656

5757
.PHONY: stop-docker-postgres
5858
stop-docker-postgres:
59-
docker stop odk-postgres || true
59+
docker stop odk-postgres14 || true
6060

6161
.PHONY: rm-docker-postgres
6262
rm-docker-postgres: stop-docker-postgres
63-
docker rm odk-postgres || true
63+
docker rm odk-postgres14 || true
6464

6565
.PHONY: check-file-headers
6666
check-file-headers:

docs/api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ Presently, it is possible to create and list `User`s in the system, as well as t
469469

470470
Currently, there are no paging or filtering options, so listing `User`s will get you every User in the system, every time.
471471

472-
Optionally, a `q` querystring parameter may be provided to filter the returned users by any given string. The search is performed via a [trigram similarity index](https://www.postgresql.org/docs/9.6/pgtrgm.html) over both the Email and Display Name fields, and results are ordered by match score, best matches first. Note that short search terms (less than 4 or 5 characters) may not return any results. Try a longer search if nothing is appearing.
472+
Optionally, a `q` querystring parameter may be provided to filter the returned users by any given string. The search is performed via a [trigram similarity index](https://www.postgresql.org/docs/14/pgtrgm.html) over both the Email and Display Name fields, and results are ordered by match score, best matches first. Note that short search terms (less than 4 or 5 characters) may not return any results. Try a longer search if nothing is appearing.
473473

474474
If a `q` parameter is given, and it exactly matches an email address that exists in the system, that user's details will always be returned, even for actors who cannot `user.list`. The request must still authenticate as a valid Actor. This allows non-Administrators to choose a user for an action (eg grant rights) without allowing full search.
475475

0 commit comments

Comments
 (0)