Skip to content

Commit 4775d30

Browse files
deps: update dependency com.google.cloud:sdk-platform-java-config to v3.46.2 (#2014)
* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.46.2 * test: use DST-aware offset in test --------- Co-authored-by: Knut Olav Løite <[email protected]>
1 parent e440894 commit 4775d30

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
shell: bash
1515
run: .kokoro/build.sh
1616
- name: Unmanaged dependency check
17-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.0
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.2
1818
with:
1919
bom-path: pom.xml

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>sdk-platform-java-config</artifactId>
17-
<version>3.46.0</version>
17+
<version>3.46.2</version>
1818
</parent>
1919
<developers>
2020
<developer>

samples/quickperf/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>sdk-platform-java-config</artifactId>
15-
<version>3.46.0</version>
15+
<version>3.46.2</version>
1616
<relativePath/>
1717
</parent>
1818

samples/snippets/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.google.cloud</groupId>
1111
<artifactId>sdk-platform-java-config</artifactId>
12-
<version>3.46.0</version>
12+
<version>3.46.2</version>
1313
<relativePath/>
1414
</parent>
1515

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -650,9 +650,6 @@ public void test03_Dates() throws SQLException {
650650

651651
@Test
652652
public void test04_Timestamps() throws SQLException {
653-
assumeFalse(
654-
"Timestamp type is not supported on POSTGRESQL dialect",
655-
dialect.dialect == Dialect.POSTGRESQL);
656653
List<String> expectedValues = new ArrayList<>();
657654
expectedValues.add("2008-01-01 10:00:00");
658655
expectedValues.add("2000-01-01 00:00:00");
@@ -711,8 +708,16 @@ public void test04_Timestamps() throws SQLException {
711708
Types.TIMESTAMP,
712709
Types.TIMESTAMP,
713710
Types.ARRAY),
714-
ImmutableList.of(
715-
"INT64", "INT64", "DATE", "TIMESTAMP", "TIMESTAMP", "ARRAY<INT64>"),
711+
dialect.dialect == Dialect.POSTGRESQL
712+
? ImmutableList.of(
713+
"bigint",
714+
"bigint",
715+
"date",
716+
"timestamp with time zone",
717+
"timestamp with time zone",
718+
"bigint[]")
719+
: ImmutableList.of(
720+
"INT64", "INT64", "DATE", "TIMESTAMP", "TIMESTAMP", "ARRAY<INT64>"),
716721
ImmutableList.of(
717722
Long.class,
718723
Long.class,
@@ -743,10 +748,7 @@ public void test04_Timestamps() throws SQLException {
743748
Timestamp inDefaultTZ = rs.getTimestamp(4);
744749
assertEquals(testTimestamp.getTime(), inDefaultTZ.getTime());
745750
// Then get it in the test timezone.
746-
if (testCalendar != null
747-
&& !System.getProperty("java.vm.name", "").toLowerCase().contains("graalvm")
748-
&& !System.getProperty("java.vendor", "").toLowerCase().contains("graalvm")
749-
&& !System.getProperty("java.vendor", "").toLowerCase().contains("oracle")) {
751+
if (testCalendar != null) {
750752
Timestamp inOtherTZ = rs.getTimestamp(4, testCalendar);
751753
assertEquals(
752754
"Timezone: "
@@ -759,7 +761,8 @@ public void test04_Timestamps() throws SQLException {
759761
+ System.getProperty("java.vm.name")
760762
+ ", vendor="
761763
+ System.getProperty("java.vendor"),
762-
testTimestamp.getTime() + testCalendar.getTimeZone().getRawOffset(),
764+
testTimestamp.getTime()
765+
+ testCalendar.getTimeZone().getOffset(inDefaultTZ.getTime()),
763766
inOtherTZ.getTime());
764767
}
765768

@@ -768,9 +771,7 @@ public void test04_Timestamps() throws SQLException {
768771
inDefaultTZ = rs.getTimestamp(5);
769772
if (testCalendar == null) {
770773
assertEquals(testTimestamp.getTime(), inDefaultTZ.getTime());
771-
} else if (!System.getProperty("java.vm.name", "").toLowerCase().contains("graalvm")
772-
&& !System.getProperty("java.vendor", "").toLowerCase().contains("graalvm")
773-
&& !System.getProperty("java.vendor", "").toLowerCase().contains("oracle")) {
774+
} else {
774775
assertEquals(
775776
"Timezone: "
776777
+ testCalendar
@@ -782,7 +783,8 @@ public void test04_Timestamps() throws SQLException {
782783
+ System.getProperty("java.vm.name")
783784
+ ", vendor="
784785
+ System.getProperty("java.vendor"),
785-
testTimestamp.getTime() - testCalendar.getTimeZone().getRawOffset(),
786+
testTimestamp.getTime()
787+
- testCalendar.getTimeZone().getOffset(inDefaultTZ.getTime()),
786788
inDefaultTZ.getTime());
787789
}
788790
// Then get it in the test timezone.

0 commit comments

Comments
 (0)