Skip to content

Commit fd26243

Browse files
committed
Merge branch 'main' into PR #2113 to update
2 parents 98ada18 + e51eaeb commit fd26243

File tree

7 files changed

+14
-9
lines changed

7 files changed

+14
-9
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
<dependency>
217217
<groupId>com.google.cloud</groupId>
218218
<artifactId>google-cloud-trace</artifactId>
219-
<version>2.76.0</version>
219+
<version>2.78.0</version>
220220
<scope>test</scope>
221221
</dependency>
222222
<dependency>

samples/spring-data-jdbc/googlesql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.springframework.data</groupId>
2525
<artifactId>spring-data-bom</artifactId>
26-
<version>2025.0.4</version>
26+
<version>2025.0.5</version>
2727
<scope>import</scope>
2828
<type>pom</type>
2929
</dependency>

samples/spring-data-jdbc/postgresql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.springframework.data</groupId>
2525
<artifactId>spring-data-bom</artifactId>
26-
<version>2025.0.4</version>
26+
<version>2025.0.5</version>
2727
<scope>import</scope>
2828
<type>pom</type>
2929
</dependency>

samples/spring-data-mybatis/googlesql/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>org.springframework.data</groupId>
3030
<artifactId>spring-data-bom</artifactId>
31-
<version>2025.0.4</version>
31+
<version>2025.0.5</version>
3232
<scope>import</scope>
3333
<type>pom</type>
3434
</dependency>
@@ -49,7 +49,7 @@
4949
<dependency>
5050
<groupId>org.testcontainers</groupId>
5151
<artifactId>testcontainers-bom</artifactId>
52-
<version>1.21.3</version>
52+
<version>2.0.1</version>
5353
<scope>import</scope>
5454
<type>pom</type>
5555
</dependency>

samples/spring-data-mybatis/postgresql/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>org.springframework.data</groupId>
3030
<artifactId>spring-data-bom</artifactId>
31-
<version>2025.0.4</version>
31+
<version>2025.0.5</version>
3232
<scope>import</scope>
3333
<type>pom</type>
3434
</dependency>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>org.testcontainers</groupId>
4444
<artifactId>testcontainers-bom</artifactId>
45-
<version>1.21.3</version>
45+
<version>2.0.1</version>
4646
<scope>import</scope>
4747
<type>pom</type>
4848
</dependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public boolean storesUpperCaseIdentifiers() {
187187

188188
@Override
189189
public boolean storesLowerCaseIdentifiers() {
190-
return false;
190+
return connection.getDialect() == Dialect.POSTGRESQL;
191191
}
192192

193193
@Override

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public static Object[] data() {
6161
@Test
6262
public void testTrivialMethods() throws SQLException {
6363
JdbcConnection connection = mock(JdbcConnection.class);
64+
when(connection.getDialect()).thenReturn(dialect);
6465
DatabaseMetaData meta = new JdbcDatabaseMetaData(connection);
6566
assertTrue(meta.allProceduresAreCallable());
6667
assertTrue(meta.allTablesAreSelectable());
@@ -132,7 +133,11 @@ public void testTrivialMethods() throws SQLException {
132133
assertTrue(meta.nullPlusNonNullIsNull());
133134
assertFalse(meta.isCatalogAtStart());
134135
assertEquals(connection.isReadOnly(), meta.isReadOnly());
135-
assertFalse(meta.storesLowerCaseIdentifiers());
136+
if (dialect == Dialect.POSTGRESQL) {
137+
assertTrue(meta.storesLowerCaseIdentifiers());
138+
} else {
139+
assertFalse(meta.storesLowerCaseIdentifiers());
140+
}
136141
assertFalse(meta.storesLowerCaseQuotedIdentifiers());
137142
assertTrue(meta.storesMixedCaseIdentifiers());
138143
assertTrue(meta.storesMixedCaseQuotedIdentifiers());

0 commit comments

Comments
 (0)