feat: if upgrade 17 -> 17 or 17-orioledb -> 17-orioledb do not run these queries

Author: samrose

ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh

@@ -43,8 +43,12 @@ POST_UPGRADE_EXTENSION_SCRIPT="/tmp/pg_upgrade/pg_upgrade_extensions.sql"
 POST_UPGRADE_POSTGRES_PERMS_SCRIPT="/tmp/pg_upgrade/pg_upgrade_postgres_perms.sql"
 OLD_PGVERSION=$(run_sql -A -t -c "SHOW server_version;")
 
-SERVER_LC_COLLATE=$(run_sql -A -t -c "SHOW lc_collate;")
-SERVER_LC_CTYPE=$(run_sql -A -t -c "SHOW lc_ctype;")
+# Skip locale settings if both versions are PostgreSQL 17+ or 17-orioledb
+if ! [[ (("$OLD_PGVERSION" =~ ^17.* || "$OLD_PGVERSION" == "17-orioledb") && ("$PGVERSION" =~ ^17.* || "$PGVERSION" == "17-orioledb")) ]]; then
+    SERVER_LC_COLLATE=$(run_sql -A -t -c "SHOW lc_collate;")
+    SERVER_LC_CTYPE=$(run_sql -A -t -c "SHOW lc_ctype;")
+fi
+
 SERVER_ENCODING=$(run_sql -A -t -c "SHOW server_encoding;")
 
 POSTGRES_CONFIG_PATH="/etc/postgresql/postgresql.conf"

ansible/vars.yml

@@ -9,9 +9,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.0.1.077-orioledb"
-  postgres17: "17.4.1.027"
-  postgres15: "15.8.1.084"
+  postgresorioledb-17: "17.0.1.078-orioledb-upgrade-1"
+  postgres17: "17.4.1.028-upgrade-1"
+  postgres15: "15.8.1.085-upgrade-1"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"