From e61f8cec7c3b39f499c0c199a528118b5fa58176 Mon Sep 17 00:00:00 2001
From: Quynh Tran <quynht@google.com>
Date: Tue, 25 Aug 2026 07:02:35 +0000
Subject: [PATCH] test: enable PG dialect integration tests in Spanner emulator

The Spanner emulator now supports the PostgreSQL dialect, so
this removes the isUsingEmulator() checks that were skipping these
integration tests in the emulator environment.
---
 .../google/cloud/spanner/it/ITQueryTest.java  | 13 +++----
 .../google/cloud/spanner/it/ITReadTest.java   | 36 ++++++++-----------
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java b/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java
index ce9c77498075..11fdf5abc104 100644
--- a/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java
+++ b/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java
@@ -84,11 +84,9 @@ public static void setUpDatabase() {
     // Empty database.
     Database googleStandardSQLDatabase = env.getTestHelper().createTestDatabase();
     googleStandardSQLClient = env.getTestHelper().getDatabaseClient(googleStandardSQLDatabase);
-    if (!isUsingEmulator()) {
-      Database postgreSQLDatabase =
-          env.getTestHelper().createTestDatabase(Dialect.POSTGRESQL, Collections.emptyList());
-      postgreSQLClient = env.getTestHelper().getDatabaseClient(postgreSQLDatabase);
-    }
+    Database postgreSQLDatabase =
+        env.getTestHelper().createTestDatabase(Dialect.POSTGRESQL, Collections.emptyList());
+    postgreSQLClient = env.getTestHelper().getDatabaseClient(postgreSQLDatabase);
   }
 
   @AfterClass
@@ -108,10 +106,7 @@ public void initSelectValueQuery() {
   public static List<DialectTestParameter> data() {
     List<DialectTestParameter> params = new ArrayList<>();
     params.add(new DialectTestParameter(Dialect.GOOGLE_STANDARD_SQL));
-    // "PG dialect tests are not supported by the emulator"
-    if (!isUsingEmulator()) {
-      params.add(new DialectTestParameter(Dialect.POSTGRESQL));
-    }
+    params.add(new DialectTestParameter(Dialect.POSTGRESQL));
     return params;
   }
 
diff --git a/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java b/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java
index 2d888996465a..b1989eb1bee6 100644
--- a/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java
+++ b/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java
@@ -18,7 +18,6 @@
 
 import static com.google.cloud.spanner.SpannerMatchers.isSpannerException;
 import static com.google.cloud.spanner.Type.StructField;
-import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.assertEquals;
@@ -110,20 +109,18 @@ public static void setUpDatabase() {
                 "CREATE INDEX TestTableByValue ON TestTable(stringvalue)",
                 "CREATE INDEX TestTableByValueDesc ON TestTable(stringvalue DESC)");
     googleStandardSQLClient = env.getTestHelper().getDatabaseClient(googleStandardSQLDatabase);
-    if (!isUsingEmulator()) {
-      Database postgreSQLDatabase =
-          env.getTestHelper()
-              .createTestDatabase(
-                  Dialect.POSTGRESQL,
-                  Arrays.asList(
-                      "CREATE TABLE TestTable ("
-                          + "  Key                VARCHAR PRIMARY KEY,"
-                          + "  StringValue        VARCHAR"
-                          + ")",
-                      "CREATE INDEX TestTableByValue ON TestTable(StringValue)",
-                      "CREATE INDEX TestTableByValueDesc ON TestTable(StringValue DESC)"));
-      postgreSQLClient = env.getTestHelper().getDatabaseClient(postgreSQLDatabase);
-    }
+    Database postgreSQLDatabase =
+        env.getTestHelper()
+            .createTestDatabase(
+                Dialect.POSTGRESQL,
+                Arrays.asList(
+                    "CREATE TABLE TestTable ("
+                        + "  Key                VARCHAR PRIMARY KEY,"
+                        + "  StringValue        VARCHAR"
+                        + ")",
+                    "CREATE INDEX TestTableByValue ON TestTable(StringValue)",
+                    "CREATE INDEX TestTableByValueDesc ON TestTable(StringValue DESC)"));
+    postgreSQLClient = env.getTestHelper().getDatabaseClient(postgreSQLDatabase);
 
     // Includes k0..k14.  Note that strings k{10,14} sort between k1 and k2.
     List<Mutation> mutations = new ArrayList<>();
@@ -137,9 +134,7 @@ public static void setUpDatabase() {
               .build());
     }
     googleStandardSQLClient.write(mutations);
-    if (!isUsingEmulator()) {
-      postgreSQLClient.write(mutations);
-    }
+    postgreSQLClient.write(mutations);
   }
 
   @AfterClass
@@ -151,10 +146,7 @@ public static void teardown() {
   public static List<DialectTestParameter> data() {
     List<DialectTestParameter> params = new ArrayList<>();
     params.add(new DialectTestParameter(Dialect.GOOGLE_STANDARD_SQL));
-    // "PG dialect tests are not supported by the emulator"
-    if (!isUsingEmulator()) {
-      params.add(new DialectTestParameter(Dialect.POSTGRESQL));
-    }
+    params.add(new DialectTestParameter(Dialect.POSTGRESQL));
     return params;
   }