Skip to content

chore: enable PG dialect integration tests in Spanner emulator #14186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tlhquynh wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −31
Open

chore: enable PG dialect integration tests in Spanner emulator #14186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e61f8ce
test: enable PG dialect integration tests in Spanner emulator
tlhquynh Aug 25, 2026
4a31788
Merge branch 'main' into enable-emulator-pg-tests
sakthivelmanii Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
}

Expand Down
36 changes: 14 additions & 22 deletions java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITReadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<>();
Expand All @@ -137,9 +134,7 @@ public static void setUpDatabase() {
.build());
}
googleStandardSQLClient.write(mutations);
if (!isUsingEmulator()) {
postgreSQLClient.write(mutations);
}
postgreSQLClient.write(mutations);
}

@AfterClass
Expand All @@ -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;
}

Expand Down
Loading