Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
JDBC-540 Add time zone bind DPB support
Also add support for decfloat-related DPB items
- Loading branch information
1 parent
25cb09a
commit 7930dd0
Showing
11 changed files
with
370 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
src/test/org/firebirdsql/jdbc/TimeZoneBindLegacyTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Firebird Open Source JavaEE Connector - JDBC Driver | ||
| * | ||
| * Distributable under LGPL license. | ||
| * You may obtain a copy of the License at http://www.gnu.org/copyleft/lgpl.html | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * LGPL License for more details. | ||
| * | ||
| * This file was created by members of the firebird development team. | ||
| * All individual contributions remain the Copyright (C) of those | ||
| * individuals. Contributors to this file are either listed here or | ||
| * can be obtained from a source control history command. | ||
| * | ||
| * All rights reserved. | ||
| */ | ||
| package org.firebirdsql.jdbc; | ||
|
|
||
| import org.firebirdsql.common.rules.UsesDatabase; | ||
| import org.junit.ClassRule; | ||
| import org.junit.Test; | ||
|
|
||
| import java.sql.*; | ||
| import java.util.Properties; | ||
|
|
||
| import static org.firebirdsql.common.FBTestProperties.*; | ||
| import static org.hamcrest.CoreMatchers.instanceOf; | ||
| import static org.junit.Assert.*; | ||
| import static org.junit.Assume.assumeTrue; | ||
|
|
||
| /** | ||
| * See also Java 8 or higher companion test {@link TimeZoneBindTest}. | ||
| */ | ||
| public class TimeZoneBindLegacyTest { | ||
|
|
||
| @ClassRule | ||
| public static final UsesDatabase usesDatabase = UsesDatabase.usesDatabase(); | ||
|
|
||
| /** | ||
| * Checks if {@code CURRENT_TIMESTAMP} returns a timestamp without time zone when time zone bind is set to legacy. | ||
| * <p> | ||
| * NOTE: We are not checking the Firebird version as this property will be ignored on earlier versions, so the | ||
| * test should work on earlier versions as well. | ||
| * </p> | ||
| */ | ||
| @Test | ||
| public void testCurrentTimestamp_legacyBind() throws Exception { | ||
| Properties props = getDefaultPropertiesForConnection(); | ||
| props.setProperty("timeZoneBind", "legacy"); | ||
| try (Connection connection = DriverManager.getConnection(getUrl(), props); | ||
| Statement stmt = connection.createStatement(); | ||
| ResultSet rs = stmt.executeQuery("select CURRENT_TIMESTAMP from RDB$DATABASE")) { | ||
| ResultSetMetaData rsmd = rs.getMetaData(); | ||
| assertEquals("Expected TIMESTAMP (WITHOUT TIME ZONE)", Types.TIMESTAMP, rsmd.getColumnType(1)); | ||
| assertTrue("Expected a row", rs.next()); | ||
| assertThat(rs.getObject(1), instanceOf(Timestamp.class)); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Checks if {@code CURRENT_TIME} returns a time without time zone when time zone bind is set to legacy. | ||
| * <p> | ||
| * NOTE: We are not checking the Firebird version as this property will be ignored on earlier versions, so the | ||
| * test should work on earlier versions as well. | ||
| * </p> | ||
| */ | ||
| @Test | ||
| public void testCurrentTime_legacyBind() throws Exception { | ||
| Properties props = getDefaultPropertiesForConnection(); | ||
| props.setProperty("timeZoneBind", "legacy"); | ||
| try (Connection connection = DriverManager.getConnection(getUrl(), props); | ||
| Statement stmt = connection.createStatement(); | ||
| ResultSet rs = stmt.executeQuery("select CURRENT_TIME from RDB$DATABASE")) { | ||
| ResultSetMetaData rsmd = rs.getMetaData(); | ||
| assertEquals("Expected TIME (WITHOUT TIME ZONE)", Types.TIME, rsmd.getColumnType(1)); | ||
| assertTrue("Expected a row", rs.next()); | ||
| assertThat(rs.getObject(1), instanceOf(Time.class)); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testRoundTrip_legacyBind() throws Exception { | ||
| assumeTrue("Requires time zone support", getDefaultSupportInfo().supportsTimeZones()); | ||
| Properties props = getDefaultPropertiesForConnection(); | ||
| props.setProperty("timeZoneBind", "legacy"); | ||
| try (Connection connection = DriverManager.getConnection(getUrl(), props)) { | ||
| try (Statement stmt = connection.createStatement()) { | ||
| stmt.execute("create table testtbl (" | ||
| + "id integer, " | ||
| + "timeval time with time zone, " | ||
| + "timestampval timestamp with time zone" | ||
| + ")"); | ||
| } | ||
|
|
||
| long timeMillis = System.currentTimeMillis(); | ||
| Timestamp timestampVal = new Timestamp(timeMillis); | ||
| Time timeVal = new Time(timeMillis); | ||
|
|
||
| try (PreparedStatement pstmt = connection.prepareStatement( | ||
| "insert into testtbl(id, timeval, timestampval) values (?, ?, ?)")) { | ||
| pstmt.setInt(1, 1); | ||
| pstmt.setTime(2, timeVal); | ||
| pstmt.setTimestamp(3, timestampVal); | ||
|
|
||
| pstmt.execute(); | ||
| } | ||
|
|
||
| try (Statement stmt = connection.createStatement(); | ||
| ResultSet rs = stmt.executeQuery( | ||
| "select timeval, timestampval, cast(timestampval as varchar(50)) from testtbl where id = 1")) { | ||
| assertTrue("expected a row", rs.next()); | ||
| System.out.println(rs.getString(3)); | ||
| // Using toString to avoid 'date' differences | ||
| assertEquals("TIME", timeVal.toString(), rs.getTime(1).toString()); | ||
| assertEquals("TIMESTAMP", timestampVal, rs.getTimestamp(2)); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } |
Oops, something went wrong.