add conf exceptions for 18 and bump to 18.3

Author: encima

ansible/tasks/stage2-setup-postgres.yml

@@ -1,9 +1,10 @@
 - name: Check psql_version and modify supautils.conf and postgresql.conf if necessary
   block:
-    - name: Check if psql_version is psql_orioledb-17 and if psql_version is psql_15 or psql_17
+    - name: Check if psql_version is psql_orioledb-17 and if psql_version is psql_15 or psql_17 or psql_18
       ansible.builtin.set_fact:
         is_psql_oriole: "{{ psql_version in ['psql_orioledb-17'] }}"
         is_psql_17: "{{ psql_version in ['psql_17'] }}"
+        is_psql_18: "{{ psql_version in ['psql_18'] }}"
         is_psql_15: "{{ psql_version in ['psql_15'] }}"
 
     - name: Execute tasks when (is_psql_oriole or is_psql_17) and stage2_nix

nix/config.nix

@@ -54,8 +54,8 @@ in
             hash = "sha256-4GMKNgCuonURcVVjJZ7CERzV9DU6SwQOC+gn+UzXqLA=";
           };
           "18" = {
-            version = "18.1";
-            hash = "sha256-/4ZnXDNsRumKyZHrswbRtnYh7OHQZ4e+qt4xLCyRXVQ=";
+            version = "18.3";
+            hash = "sha256-2VZj+786gPganZjYlSZr3LdLonS8wE7212Ywpy3uAW8=";
           };
         };
         orioledb = {

nix/ext/tests/lib.nix

@@ -100,7 +100,7 @@ let
 
       # Version-specific adjustments (mirroring run-server.sh.in:250-295)
       ${
-        if majorVersion == "17" || majorVersion == "orioledb-17" then
+        if majorVersion >= "17" || majorVersion >= "orioledb-17" then
           ''
             # PG 17+: remove timescaledb from shared_preload_libraries
             sed -i 's/ timescaledb,//g' $out/postgresql.conf

nix/ext/versions.json

@@ -886,7 +886,7 @@
       "revision": "2.1.0",
       "hash": "sha256-STJVvvrLVLe1JevNu6u6EftzAWv+X+J8lu66su7Or2s="
     },
-    "2.3.1": {
+    "2.3": {
       "postgresql": [
         "18"
       ],

nix/tools/run-server.sh.in

@@ -285,6 +285,11 @@ orioledb_config_items() {
         perl -pi -e 's/ timescaledb,//g' "$DATDIR/postgresql.conf"
         perl -pi -e 's/ timescaledb,//g' "$DATDIR/supautils.conf"
         perl -pi -e 's/ plv8,//g;' "$DATDIR/supautils.conf"
+    elif [[ "$VERSION" == "18" && "$CURRENT_SYSTEM" = "aarch64-darwin" ]]; then
+        perl -pi -e 's/db_user_namespace = off/#db_user_namespace = off/g;' "$DATDIR/postgresql.conf"
+        perl -pi -e 's/ timescaledb,//g' "$DATDIR/postgresql.conf"
+        perl -pi -e 's/ timescaledb,//g' "$DATDIR/supautils.conf"
+        perl -pi -e 's/ plv8,//g;' "$DATDIR/supautils.conf"
     fi
 }