From b8d7c6039bce5bc4e2373186ec737b215ea7dd3e Mon Sep 17 00:00:00 2001
From: Samir Talwar <samir.talwar@hasura.io>
Date: Fri, 19 Jul 2024 10:16:24 +0200
Subject: [PATCH] Use a test PostgreSQL image based on Debian, not Alpine.

Alpine is often slower than Debian (because musl is sometimes slower than glibc) and not how anyone actually deploys PostgreSQL in production.

Most notably, some floating-point computations result in slightly different values, and Debian ships with better support for different locales so sorting text (e.g. with `ORDER BY`) behaves differently.

Let's test against an environment that people are likely to actually use.

As a result, there are slight changes to the results of PostGIS computations in a couple of test cases.

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/10942
GitOrigin-RevId: 4caed19def23a372fc3930c409514b1c9b385026
---
 docker-compose/databases.yaml                                   | 2 +-
 scripts/containers/postgres                                     | 2 +-
 server/lib/upgrade-tests/src/Hasura/UpgradeTests/Database.hs    | 2 +-
 .../boolexp/raster/query_st_intersects_geom_nband.yaml          | 2 +-
 .../graphql_query/boolexp/raster/query_st_intersects_rast.yaml  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-compose/databases.yaml b/docker-compose/databases.yaml
index 564dff7f6dc3e..c8f3323e2a094 100644
--- a/docker-compose/databases.yaml
+++ b/docker-compose/databases.yaml
@@ -1,6 +1,6 @@
 services:
   postgres:
-    image: postgis/postgis:16-3.4-alpine
+    image: postgis/postgis:16-3.4
     platform: linux/amd64
     command:
       - -F # turn fsync off for speed
diff --git a/scripts/containers/postgres b/scripts/containers/postgres
index b812e1e670fd9..65f497112b671 100644
--- a/scripts/containers/postgres
+++ b/scripts/containers/postgres
@@ -17,7 +17,7 @@ fi
 
 PG_PASSWORD=postgres
 PG_VOLUME_NAME='hasura-dev-postgres'
-PG_CONTAINER_IMAGE='postgis/postgis:16-3.4-alpine'
+PG_CONTAINER_IMAGE='postgis/postgis:16-3.4'
 PG_CONTAINER_NAME="hasura-dev-postgres-$PG_PORT"
 PG_DB_URL="postgresql://postgres:$PG_PASSWORD@127.0.0.1:$PG_PORT/postgres"
 PG_DOCKER="docker exec -u postgres $PG_CONTAINER_NAME psql $PG_DB_URL"
diff --git a/server/lib/upgrade-tests/src/Hasura/UpgradeTests/Database.hs b/server/lib/upgrade-tests/src/Hasura/UpgradeTests/Database.hs
index e24faf9b79c02..962ea7bde0f84 100644
--- a/server/lib/upgrade-tests/src/Hasura/UpgradeTests/Database.hs
+++ b/server/lib/upgrade-tests/src/Hasura/UpgradeTests/Database.hs
@@ -47,7 +47,7 @@ dbContainer :: TC.Network -> TC.TestContainer Database
 dbContainer network = do
   container <-
     TC.run
-      $ TC.containerRequest (TC.fromTag ("postgis/postgis:16-3.4-alpine"))
+      $ TC.containerRequest (TC.fromTag ("postgis/postgis:16-3.4"))
       & TC.setSuffixedName "hge-test-upgrade-db"
       & TC.withNetwork network
       & TC.withNetworkAlias "db"
diff --git a/server/tests-py/queries/graphql_query/boolexp/raster/query_st_intersects_geom_nband.yaml b/server/tests-py/queries/graphql_query/boolexp/raster/query_st_intersects_geom_nband.yaml
index 76c6a9f0e0320..835b3bc599a12 100644
--- a/server/tests-py/queries/graphql_query/boolexp/raster/query_st_intersects_geom_nband.yaml
+++ b/server/tests-py/queries/graphql_query/boolexp/raster/query_st_intersects_geom_nband.yaml
@@ -7,7 +7,7 @@ response:
     - rid: 1
       rast: 01000001009A9999999999E93F9A9999999999E9BF000000000000F0BF000000000000104000000000000000000000000000000000E610000005000500440000010101000101010101010101010101010101010001010100
     - rid: 2
-      rast: 0100000100156C8E335B91F13FE2385B00285EF6BF350EE40064EBFFBF8D033900D9FA134000000000000000000000000000000000E610000005000500440000000101010001010101010101010101010101000101010000
+      rast: 0100000100166C8E335B91F13FE2385B00285EF6BF360EE40064EBFFBF8D033900D9FA134000000000000000000000000000000000E610000005000500440000000101010001010101010101010101010101000101010000
 query:
   variables:
     point:
diff --git a/server/tests-py/queries/graphql_query/boolexp/raster/query_st_intersects_rast.yaml b/server/tests-py/queries/graphql_query/boolexp/raster/query_st_intersects_rast.yaml
index 9cfa92381e451..a0a054d286f96 100644
--- a/server/tests-py/queries/graphql_query/boolexp/raster/query_st_intersects_rast.yaml
+++ b/server/tests-py/queries/graphql_query/boolexp/raster/query_st_intersects_rast.yaml
@@ -7,7 +7,7 @@ response:
     - rid: 1
       rast: 01000001009A9999999999E93F9A9999999999E9BF000000000000F0BF000000000000104000000000000000000000000000000000E610000005000500440000010101000101010101010101010101010101010001010100
     - rid: 2
-      rast: 0100000100156C8E335B91F13FE2385B00285EF6BF350EE40064EBFFBF8D033900D9FA134000000000000000000000000000000000E610000005000500440000000101010001010101010101010101010101000101010000
+      rast: 0100000100166C8E335B91F13FE2385B00285EF6BF360EE40064EBFFBF8D033900D9FA134000000000000000000000000000000000E610000005000500440000000101010001010101010101010101010101000101010000
 query:
   variables:
     rast: 0100000100000000000000004000000000000000C00000000000000000000000000000084000000000000000000000000000000000E610000001000100440001