test: enable integration tests for PG on emulator (#1526)

The emulator now supports PostgreSQL, so we can enable the integration tests for PostgreSQL when running on the emulator.

This change also changes some of the tests that had workarounds for features that were initially missing in PostgreSQL, such as support for DATE and TIMESTAMPTZ.

Author: olavloite

src/test/java/com/google/cloud/spanner/jdbc/it/ITAbstractJdbcTest.java

@@ -16,14 +16,15 @@
 
 package com.google.cloud.spanner.jdbc.it;
 
+import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator;
+
 import com.google.cloud.spanner.Database;
 import com.google.cloud.spanner.Dialect;
 import com.google.cloud.spanner.GceTestEnvConfig;
 import com.google.cloud.spanner.connection.AbstractSqlScriptVerifier;
 import com.google.cloud.spanner.connection.ITAbstractSpannerTest;
 import com.google.cloud.spanner.jdbc.CloudSpannerJdbcConnection;
 import com.google.cloud.spanner.jdbc.JdbcSqlScriptVerifier.JdbcGenericConnection;
-import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import java.nio.file.Files;
@@ -116,7 +117,7 @@ static Collection<String> getMusicTablesDdl(Dialect dialect) {
       default:
         scriptFile = "CreateMusicTables.sql";
     }
-    if (EmulatorSpannerHelper.isUsingEmulator()) {
+    if (dialect != Dialect.POSTGRESQL && isUsingEmulator()) {
       scriptFile = "CreateMusicTables_Emulator.sql";
     }
     return AbstractSqlScriptVerifier.readStatementsFromFile(scriptFile, ITAbstractJdbcTest.class)
@@ -130,7 +131,7 @@ public Dialect getDialect() {
   }
 
   public String getDefaultCatalog(Database database) {
-    if (getDialect() == Dialect.POSTGRESQL) {
+    if (getDialect() == Dialect.POSTGRESQL && !isUsingEmulator()) {
       return database.getId().getDatabase();
     }
     return "";

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcConnectTest.java

@@ -73,8 +73,7 @@ private String createBaseUrl() {
     if (EmulatorSpannerHelper.isUsingEmulator()) {
       url.append("//").append(System.getenv("SPANNER_EMULATOR_HOST"));
     }
-    // Extract "//x.y.googleapis.com" from "https://x.y.googleapis.com" and append it to
-    // url.
+    // Extract "//x.y.googleapis.com" from "https://x.y.googleapis.com" and append it to url.
     if (options.getHost() != null) {
       url.append(options.getHost().substring(options.getHost().indexOf(':') + 1));
     }

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcDdlTest.java

@@ -16,13 +16,10 @@
 
 package com.google.cloud.spanner.jdbc.it;
 
-import static org.junit.Assume.assumeFalse;
-
 import com.google.cloud.spanner.Database;
 import com.google.cloud.spanner.Dialect;
 import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.jdbc.JdbcSqlScriptVerifier;
-import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -64,9 +61,6 @@ public static List<DialectTestParameter> data() {
 
   @Before
   public void setup() {
-    assumeFalse(
-        "Emulator does not support PostgreSQL",
-        dialect.dialect == Dialect.POSTGRESQL && EmulatorSpannerHelper.isUsingEmulator());
     database = env.getOrCreateDatabase(getDialect(), Collections.emptyList());
   }
 

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPgDatabaseMetaDataTest.java

@@ -21,12 +21,10 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
 
 import com.google.cloud.spanner.Database;
 import com.google.cloud.spanner.Dialect;
 import com.google.cloud.spanner.ParallelIntegrationTest;
-import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -35,7 +33,6 @@
 import java.util.Arrays;
 import java.util.List;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -57,20 +54,14 @@ public class ITJdbcPgDatabaseMetaDataTest extends ITAbstractJdbcTest {
   private static final String TABLE_WITH_ALL_COLS = "TableWithAllColumnTypes";
   private static final String TABLE_WITH_REF = "TableWithRef";
 
-  @BeforeClass
-  public static void skipOnEmulator() {
-    assumeFalse(
-        "PostgreSQL dialect is not yet supported on the emulator",
-        EmulatorSpannerHelper.isUsingEmulator());
-  }
-
   private Database database;
 
   @Before
   public void setup() {
     database = env.getOrCreateDatabase(getDialect(), getMusicTablesDdl(getDialect()));
   }
 
+  @Override
   public Dialect getDialect() {
     return Dialect.POSTGRESQL;
   }

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPgNumericTest.java

@@ -16,10 +16,10 @@
 
 package com.google.cloud.spanner.jdbc.it;
 
+import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assume.assumeFalse;
 
 import com.google.cloud.spanner.Database;
 import com.google.cloud.spanner.DatabaseAdminClient;
@@ -30,7 +30,6 @@
 import com.google.cloud.spanner.Value;
 import com.google.cloud.spanner.connection.ConnectionOptions;
 import com.google.cloud.spanner.jdbc.JdbcSqlExceptionFactory.JdbcSqlExceptionImpl;
-import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
 import com.google.cloud.spanner.testing.RemoteSpannerHelper;
 import java.math.BigDecimal;
 import java.sql.Connection;
@@ -64,8 +63,6 @@ public class ITJdbcPgNumericTest {
 
   @BeforeClass
   public static void setup() throws Exception {
-    assumeFalse(
-        "PgNumeric is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
     testHelper = env.getTestHelper();
     final String projectId = testHelper.getInstanceId().getProject();
     final String instanceId = testHelper.getInstanceId().getInstance();
@@ -83,6 +80,9 @@ public static void setup() throws Exception {
             .createDatabase(databaseToCreate, Collections.emptyList())
             .get(OPERATION_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
     url = "jdbc:cloudspanner://" + host + "/" + database.getId() + "?dialect=postgresql";
+    if (isUsingEmulator()) {
+      url += ";usePlainText=true";
+    }
   }
 
   @AfterClass
@@ -95,8 +95,6 @@ public static void teardown() {
 
   @Test
   public void testResultSet() throws SQLException {
-    assumeFalse(
-        "PgNumeric is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
     final String table = testHelper.getUniqueDatabaseId();
     final String positiveBigNumeric =
         String.join("", Collections.nCopies(131072, "1"))
@@ -124,7 +122,7 @@ public void testResultSet() throws SQLException {
 
     try (Connection connection = DriverManager.getConnection(url);
         Statement statement = connection.createStatement();
-        ResultSet resultSet = statement.executeQuery("SELECT * FROM " + table)) {
+        ResultSet resultSet = statement.executeQuery("SELECT * FROM " + table + " ORDER BY id")) {
 
       resultSet.next();
       assertEquals("1.23", resultSet.getString("col1"));
@@ -190,8 +188,6 @@ public void testResultSet() throws SQLException {
 
   @Test
   public void testPreparedStatement() throws Exception {
-    assumeFalse(
-        "PgNumeric is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
     final String table = testHelper.getUniqueDatabaseId();
     try (Connection connection = DriverManager.getConnection(url);
         Statement statement = connection.createStatement(); ) {
@@ -253,7 +249,7 @@ public void testPreparedStatement() throws Exception {
 
     try (Connection connection = DriverManager.getConnection(url);
         Statement statement = connection.createStatement();
-        ResultSet resultSet = statement.executeQuery("SELECT * FROM " + table)) {
+        ResultSet resultSet = statement.executeQuery("SELECT * FROM " + table + " ORDER BY id")) {
       resultSet.next();
       assertNull(resultSet.getObject("col1"));