Skip to content

Commit 34ceefe

Browse files
chore: Update product name in JDBC metadata for PG dialect (#2353)
1 parent c9fe827 commit 34ceefe

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

java-spanner-jdbc/src/main/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaData.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class JdbcDatabaseMetaData extends AbstractJdbcWrapper implements DatabaseMetaDa
4848
private static final int DATABASE_MAJOR_VERSION = 1;
4949
private static final int DATABASE_MINOR_VERSION = 0;
5050
private static final String PRODUCT_NAME = "Google Cloud Spanner";
51+
private static final String POSTGRESQL_PRODUCT_NAME = PRODUCT_NAME + " PostgreSQL";
5152

5253
@VisibleForTesting
5354
static String readSqlFromFile(String filename, Dialect dialect) {
@@ -137,7 +138,7 @@ public boolean nullsAreSortedAtEnd() {
137138

138139
@Override
139140
public String getDatabaseProductName() {
140-
return PRODUCT_NAME;
141+
return connection.getDialect() == Dialect.POSTGRESQL ? POSTGRESQL_PRODUCT_NAME : PRODUCT_NAME;
141142
}
142143

143144
@Override

java-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/JdbcDatabaseMetaDataTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public static Object[] data() {
5757
private static final int DATABASE_MAJOR_VERSION = 1;
5858
private static final int DATABASE_MINOR_VERSION = 0;
5959
private static final String DATABASE_PRODUCT_NAME = "Google Cloud Spanner";
60+
private static final String POSTGRESQL_DATABASE_PRODUCT_NAME =
61+
DATABASE_PRODUCT_NAME + " PostgreSQL";
6062

6163
@Test
6264
public void testTrivialMethods() throws SQLException {
@@ -90,7 +92,6 @@ public void testTrivialMethods() throws SQLException {
9092
assertEquals("CATALOG", meta.getCatalogTerm());
9193
assertEquals(DATABASE_MAJOR_VERSION, meta.getDatabaseMajorVersion());
9294
assertEquals(DATABASE_MINOR_VERSION, meta.getDatabaseMinorVersion());
93-
assertEquals(DATABASE_PRODUCT_NAME, meta.getDatabaseProductName());
9495
assertEquals(
9596
DATABASE_MAJOR_VERSION + "." + DATABASE_MINOR_VERSION, meta.getDatabaseProductVersion());
9697
assertEquals(Connection.TRANSACTION_SERIALIZABLE, meta.getDefaultTransactionIsolation());
@@ -134,8 +135,10 @@ public void testTrivialMethods() throws SQLException {
134135
assertFalse(meta.isCatalogAtStart());
135136
assertEquals(connection.isReadOnly(), meta.isReadOnly());
136137
if (dialect == Dialect.POSTGRESQL) {
138+
assertEquals(POSTGRESQL_DATABASE_PRODUCT_NAME, meta.getDatabaseProductName());
137139
assertTrue(meta.storesLowerCaseIdentifiers());
138140
} else {
141+
assertEquals(DATABASE_PRODUCT_NAME, meta.getDatabaseProductName());
139142
assertFalse(meta.storesLowerCaseIdentifiers());
140143
}
141144
assertFalse(meta.storesLowerCaseQuotedIdentifiers());

0 commit comments

Comments
 (0)