nix: add postgrest-with-oriole-17

Author: wolfgangwalther

.github/workflows/test.yaml

@@ -70,8 +70,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pgVersion: [14, 15, 16, 17, 18]
-    name: PG ${{ matrix.pgVersion }}
+        pgVersion: [pg-14, pg-15, pg-16, pg-17, pg-18, oriole-17]
+    name: ${{ matrix.pgVersion }}
     runs-on: ubuntu-24.04
     defaults:
       run:
@@ -84,25 +84,25 @@ jobs:
         uses: ./.github/actions/setup-nix
         with:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          tools: tests.testSpec.bin tests.testObservability.bin tests.testIO.bin tests.testBigSchema.bin withTools.pg-${{ matrix.pgVersion }}.bin cabalTools.update.bin
+          tools: tests.testSpec.bin tests.testObservability.bin tests.testIO.bin tests.testBigSchema.bin withTools.${{ matrix.pgVersion }}.bin cabalTools.update.bin
 
       - run: postgrest-cabal-update
 
       - name: Run spec tests
         if: always()
-        run: postgrest-with-pg-${{ matrix.pgVersion }} postgrest-test-spec
+        run: postgrest-with-${{ matrix.pgVersion }} postgrest-test-spec
 
       - name: Run observability tests
         if: always()
-        run: postgrest-with-pg-${{ matrix.pgVersion }} postgrest-test-observability
+        run: postgrest-with-${{ matrix.pgVersion }} postgrest-test-observability
 
       - name: Run IO tests
         if: always()
-        run: postgrest-with-pg-${{ matrix.pgVersion }} postgrest-test-io -vv
+        run: postgrest-with-${{ matrix.pgVersion }} postgrest-test-io -vv
 
       - name: Run IO tests on a big schema
         if: always()
-        run: postgrest-with-pg-${{ matrix.pgVersion }} postgrest-test-big-schema -vv
+        run: postgrest-with-${{ matrix.pgVersion }} postgrest-test-big-schema -vv
 
 
   memory:

default.nix

@@ -57,6 +57,14 @@ let
       { name = "pg-16"; postgresql = pkgs.postgresql_16.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
       { name = "pg-15"; postgresql = pkgs.postgresql_15.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
       { name = "pg-14"; postgresql = pkgs.postgresql_14.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
+      {
+        name = "oriole-17";
+        postgresql = pkgs.orioledb.withPackages (p: [ p.postgis p.pg_safeupdate ]);
+        config = "
+          default_table_access_method = 'orioledb'
+          shared_preload_libraries = 'orioledb'
+        ";
+      }
     ];
 
   haskellPackages = pkgs.haskell.packages."${compiler}";

flake.lock

@@ -2,7 +2,7 @@
   description = "REST API for any Postgres database";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs.url = "github:wolfgangwalther/nixpkgs/orioledb-latest";
   };
 
   nixConfig = {

flake.nix

@@ -11,9 +11,13 @@
 }:
 let
   withTmpDb =
-    { name, postgresql }:
+    { name, postgresql, config ? "" }:
     let
       commandName = "postgrest-with-${name}";
+      postgresqlConf = writeText "postgresql.conf" ("
+        listen_addresses = ''
+        log_statement = all
+      " + config);
     in
     checkedShellScript
       {
@@ -72,6 +76,10 @@ let
           TZ=$PGTZ initdb --no-locale --encoding=UTF8 --nosync -U postgres --auth=trust \
             >> "$setuplog"
 
+          # Append our own config to the one initdb created to avoid replacing
+          # default values created by the latter.
+          cat ${postgresqlConf} >> "$tmpdir/db/postgresql.conf"
+
           log "Starting the database cluster..."
 
           # Instead of listening on a local port, we will listen on a unix domain socket.
@@ -80,7 +88,7 @@ let
           # On MacOS, it's 104 chars
           # See: https://serverfault.com/questions/641347/check-if-a-path-exceeds-maximum-for-unix-domain-socket
 
-          pg_ctl -l "$tmpdir/db.log" -w start -o "-F -c listen_addresses=\"\" -c hba_file=$HBA_FILE -k $PGHOST -c log_statement=\"all\" " \
+          pg_ctl -l "$tmpdir/db.log" -w start -o "-F -c hba_file=$HBA_FILE -k $PGHOST " \
             >> "$setuplog"
 
           log "Creating a minimally privileged $PGUSER connection role..."
@@ -106,7 +114,7 @@ let
             log "Starting replica on $replica_host"
 
             # We set a low max_standby_streaming_delay to make the replication conflict fail faster in tests (otherwise it waits for the default 30s)
-            pg_ctl -D "$replica_dir" -l "$replica_dblog" -w start -o "-F -c listen_addresses=\"\" -c hba_file=$HBA_FILE -k $replica_host -c log_statement=\"all\" -c max_standby_streaming_delay=\"3s\" " \
+            pg_ctl -D "$replica_dir" -l "$replica_dblog" -w start -o "-F -c hba_file=$HBA_FILE -k $replica_host-c max_standby_streaming_delay=\"3s\" " \
               >> "$setuplog"
 
             >&2 echo "${commandName}: Replica enabled. You can connect to it with: psql 'postgres:///$PGDATABASE?host=$replica_host' -U postgres"

nix/tools/withTools.nix

@@ -2,6 +2,7 @@
 
 \set ON_ERROR_STOP on
 
+\ir ../../orioledb.sql
 \ir database.sql
 \ir db_config.sql
 \ir roles.sql

test/io/fixtures/load.sql

@@ -1,3 +1,5 @@
+\ir ../orioledb.sql
+
 CREATE ROLE postgrest_test_anonymous;
 CREATE ROLE postgrest_test_author;
 GRANT postgrest_test_anonymous TO :"PGUSER";

test/load/fixtures.sql

@@ -2,6 +2,7 @@
 
 \set ON_ERROR_STOP on
 
+\ir ../../orioledb.sql
 \ir database.sql
 \ir roles.sql
 \ir schema.sql

test/observability/fixtures/load.sql

@@ -0,0 +1,6 @@
+SELECT EXISTS (SELECT * FROM pg_available_extensions WHERE name = 'orioledb') AS is_orioledb_available \gset
+
+\if :is_orioledb_available
+  CREATE SCHEMA orioledb;
+  CREATE EXTENSION orioledb WITH SCHEMA orioledb;
+\endif

test/orioledb.sql

@@ -2,6 +2,7 @@
 
 \set ON_ERROR_STOP on
 
+\ir ../../orioledb.sql
 \ir database.sql
 \ir roles.sql
 \ir schema.sql