joerg/database
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove ZonedDateTime

Browse source
This commit is contained in:
Jörg Prante 2025-03-18 20:10:04 +01:00
parent 0d750fbe06
commit d01695aff4
18 changed files with 7 additions and 196 deletions
gradle.properties
jdbc-mariadb/src/main/java/org/xbib/jdbc/mariadb
MariaDB.java
jdbc-oracle/src/main/java/org/xbib/jdbc/oracle
Oracle.java
jdbc-postgresql/src/main/java/org/xbib/jdbc/postgresql
Postgresql.java
jdbc-query/src
main/java/org/xbib/jdbc/query
Flavor.javaRow.javaRowsAdapter.javaSchema.javaSqlInsert.javaSqlInsertImpl.javaSqlSelect.javaSqlSelectImpl.javaStatementAdapter.java
flavor
Derby.javaH2.javaHsql.java
test/java/org/xbib/jdbc/query/test
RowStub.java
jdbc-test/src/main/java/org/xbib/jdbc/test
CommonTest.java

2
gradle.properties
View file

@ -1,3 +1,3 @@
group = org.xbib
name = database
version = 2.4.0
version = 2.5.0

5
jdbc-mariadb/src/main/java/org/xbib/jdbc/mariadb/MariaDB.java
View file

@ -117,11 +117,6 @@ public class MariaDB implements Flavor {
return "datetime(3)"; // 3 = millisecond resolution
}
@Override
public String typeZonedDateTime() {
return "datetime(3)"; // 3 = millisecond resolution
}
@Override
public String typeLocalDate() {
return "date";

5
jdbc-oracle/src/main/java/org/xbib/jdbc/oracle/Oracle.java
View file

@ -96,11 +96,6 @@ public class Oracle implements Flavor {
return "timestamp with time zone";
}
@Override
public String typeZonedDateTime() {
return "timestamp with time zone";
}
@Override
public String typeLocalDate() {
// well, this is a full blown timestamp in Oracle

5
jdbc-postgresql/src/main/java/org/xbib/jdbc/postgresql/Postgresql.java
View file

@ -114,11 +114,6 @@ public class Postgresql implements Flavor {
return "timestamp with time zone";
}
@Override
public String typeZonedDateTime() {
return "timestamp with time zone";
}
@Override
public String typeLocalDate() {
return "date";

2
jdbc-query/src/main/java/org/xbib/jdbc/query/Flavor.java
View file

@ -44,8 +44,6 @@ public interface Flavor {
String typeOffsetDateTime();
String typeZonedDateTime();
String typeLocalDate();
boolean useStringForClob();

8
jdbc-query/src/main/java/org/xbib/jdbc/query/Row.java
View file

@ -8,8 +8,6 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
/**
* Interface for reading results from a database query.
@ -376,12 +374,6 @@ public interface Row {
OffsetDateTime getOffsetDateTimeOrNull(String columnName);
ZonedDateTime getZonedDateTimeOrNull();
ZonedDateTime getZonedDateTimeOrNull(int columnOneBase);
ZonedDateTime getZonedDateTimeOrNull(String columnName);
/**
* Retrieve column as LocalDate, .i.e, date with no time.
*

26
jdbc-query/src/main/java/org/xbib/jdbc/query/RowsAdapter.java
View file

@ -13,7 +13,6 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
/**
* Safely wrap a ResultSet and provide access to the data it contains.
@ -758,31 +757,6 @@ class RowsAdapter implements Rows {
}
}
@Override
public ZonedDateTime getZonedDateTimeOrNull() {
return getZonedDateTimeOrNull(column++);
}
@Override
public ZonedDateTime getZonedDateTimeOrNull(int columnOneBased) {
try {
column = columnOneBased + 1;
return rs.getObject(columnOneBased, ZonedDateTime.class);
} catch (SQLException e) {
throw new DatabaseException(e);
}
}
@Override
public ZonedDateTime getZonedDateTimeOrNull(String columnName) {
try {
column = rs.findColumn(columnName) + 1;
return rs.getObject(columnName, ZonedDateTime.class);
} catch (SQLException e) {
throw new DatabaseException(e);
}
}
@Override
public Integer rowCount() {
try {

8
jdbc-query/src/main/java/org/xbib/jdbc/query/Schema.java
View file

@ -238,9 +238,6 @@ public class Schema {
case OffsetDateTime:
sql.append(flavor.typeOffsetDateTime());
break;
case ZonedDateTime:
sql.append(flavor.typeZonedDateTime());
break;
case LocalDate:
sql.append(flavor.typeLocalDate());
break;
@ -418,7 +415,6 @@ public class Schema {
Instant,
LocalDateTime,
OffsetDateTime,
ZonedDateTime,
LocalDate,
Boolean
}
@ -939,10 +935,6 @@ public class Schema {
return asType(ColumnType.OffsetDateTime);
}
public Column asZonedateTime() {
return asType(ColumnType.ZonedDateTime);
}
public Column asLocalDate() {
return asType(ColumnType.LocalDate);
}

6
jdbc-query/src/main/java/org/xbib/jdbc/query/SqlInsert.java
View file

@ -7,8 +7,6 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
/**
* Interface for configuring (setting parameters) and executing a chunk of SQL.
@ -55,10 +53,6 @@ public interface SqlInsert {
SqlInsert argOffsetDateTime(String argName, OffsetDateTime arg);
SqlInsert argZonedDateTime(ZonedDateTime arg);
SqlInsert argZonedDateTime(String argName, ZonedDateTime arg);
SqlInsert argLocalDate(LocalDate arg);
SqlInsert argLocalDate( String argName, LocalDate arg);

11
jdbc-query/src/main/java/org/xbib/jdbc/query/SqlInsertImpl.java
View file

@ -17,7 +17,6 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@ -183,16 +182,6 @@ public class SqlInsertImpl implements SqlInsert {
return namedArg(argName, adaptor.nullOffsetDateTime(arg));
}
@Override
public SqlInsert argZonedDateTime(ZonedDateTime arg) {
return positionalArg(adaptor.nullZonedDateTime(arg));
}
@Override
public SqlInsert argZonedDateTime(String argName, ZonedDateTime arg) {
return namedArg(argName, adaptor.nullZonedDateTime(arg));
}
@Override
public SqlInsert argLocalDateTimeNowPerDb() {
if (options.useClientClock()) {

9
jdbc-query/src/main/java/org/xbib/jdbc/query/SqlSelect.java
View file

@ -5,7 +5,6 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.util.List;
/**
@ -53,10 +52,6 @@ public interface SqlSelect {
SqlSelect argOffsetDateTime(String argName, OffsetDateTime arg);
SqlSelect argZonedDateTime(ZonedDateTime arg);
SqlSelect argZonedDateTime(String argName, ZonedDateTime arg);
SqlSelect argLocalDate(LocalDate arg);
SqlSelect argLocalDate(String argName, LocalDate arg);
@ -139,10 +134,6 @@ public interface SqlSelect {
List<LocalDateTime> queryLocalDateTimes();
ZonedDateTime queryZonedDateTimeOrNull();
List<ZonedDateTime> queryZonedDateTimes();
LocalDate queryLocalDateOrNull();
List<LocalDate> queryLocalDates();

37
jdbc-query/src/main/java/org/xbib/jdbc/query/SqlSelectImpl.java
View file

@ -13,7 +13,6 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -167,16 +166,6 @@ public class SqlSelectImpl implements SqlSelect {
return namedArg(argName, adaptor.nullOffsetDateTime(arg));
}
@Override
public SqlSelect argZonedDateTime(ZonedDateTime arg) {
return positionalArg(adaptor.nullZonedDateTime(arg));
}
@Override
public SqlSelect argZonedDateTime(String argName, ZonedDateTime arg) {
return namedArg(argName, adaptor.nullZonedDateTime(arg));
}
@Override
public SqlSelect argLocalDate(LocalDate arg) {
return positionalArg(adaptor.nullLocalDate(arg));
@ -527,33 +516,8 @@ public class SqlSelectImpl implements SqlSelect {
});
}
@Override
public ZonedDateTime queryZonedDateTimeOrNull() {
return queryWithTimeout(rs -> {
if (rs.next()) {
return rs.getZonedDateTimeOrNull(1);
}
return null;
});
}
@Override
public List<ZonedDateTime> queryZonedDateTimes() {
return queryWithTimeout(rs -> {
List<ZonedDateTime> result = new ArrayList<>();
while (rs.next()) {
ZonedDateTime value = rs.getZonedDateTimeOrNull(1);
if (value != null) {
result.add(value);
}
}
return result;
});
}
@Override
public LocalDate queryLocalDateOrNull() {
// Date without time
return queryWithTimeout(rs -> {
if (rs.next()) {
return rs.getLocalDateOrNull(1);
@ -564,7 +528,6 @@ public class SqlSelectImpl implements SqlSelect {
@Override
public List<LocalDate> queryLocalDates() {
// Date without time
return queryWithTimeout(rs -> {
List<LocalDate> result = new ArrayList<>();
while (rs.next()) {

5
jdbc-query/src/main/java/org/xbib/jdbc/query/StatementAdapter.java
View file

@ -17,7 +17,6 @@ import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
import java.util.logging.Level;
@ -105,10 +104,6 @@ public class StatementAdapter {
return arg == null ? new SqlNull(Types.TIMESTAMP) : Timestamp.valueOf(arg);
}
public Object nullZonedDateTime(ZonedDateTime arg) {
return arg == null ? new SqlNull(Types.TIMESTAMP) : Timestamp.valueOf(arg.toLocalDateTime());
}
public Object nullOffsetDateTime(OffsetDateTime arg) {
return arg == null ? new SqlNull(Types.TIMESTAMP) : Timestamp.valueOf(arg.toLocalDateTime());
}

5
jdbc-query/src/main/java/org/xbib/jdbc/query/flavor/Derby.java
View file

@ -110,11 +110,6 @@ public class Derby implements Flavor {
return "timestamptz";
}
@Override
public String typeZonedDateTime() {
return "timestamptz";
}
@Override
public String typeLocalDate() {
return "date";

5
jdbc-query/src/main/java/org/xbib/jdbc/query/flavor/H2.java
View file

@ -110,11 +110,6 @@ public class H2 implements Flavor {
return "timestamptz";
}
@Override
public String typeZonedDateTime() {
return "timestamptz";
}
@Override
public String typeLocalDate() {
return "date";

5
jdbc-query/src/main/java/org/xbib/jdbc/query/flavor/Hsql.java
View file

@ -110,11 +110,6 @@ public class Hsql implements Flavor {
return "timestamp with time zone";
}
@Override
public String typeZonedDateTime() {
return "timestamp with time zone";
}
@Override
public String typeLocalDate() {
return "date";

38
jdbc-query/src/test/java/org/xbib/jdbc/query/test/RowStub.java
View file

@ -14,8 +14,6 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@ -632,23 +630,6 @@ public class RowStub {
return toOffsetDateTime(rows.get(row)[columnIndexByName(columnName)]);
}
@Override
public ZonedDateTime getZonedDateTimeOrNull() {
return toZonedDateTime(rows.get(row)[++col]);
}
@Override
public ZonedDateTime getZonedDateTimeOrNull(int columnOneBased) {
col = columnOneBased;
return toZonedDateTime(rows.get(row)[columnOneBased - 1]);
}
@Override
public ZonedDateTime getZonedDateTimeOrNull(String columnName) {
col = columnIndexByName(columnName) + 1;
return toZonedDateTime(rows.get(row)[columnIndexByName(columnName)]);
}
@Override
public LocalDate getLocalDateOrNull() {
return toLocalDate(rows.get(row)[++col]);
@ -751,12 +732,10 @@ public class RowStub {
private LocalDateTime toLocalDateTime(Object o) {
if (o instanceof String s) {
if (s.length() == "yyyy-MM-dd".length()) {
return LocalDateTime.parse(s, DateTimeFormatter.ofPattern("yyyy-MM-dd"))
.atZone(ZoneId.systemDefault()).toLocalDateTime();
return LocalDateTime.parse(s, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
}
if (s.length() == "yyyy-MM-ddThh:mm:ss".length()) {
return LocalDateTime.parse(s, DateTimeFormatter.ofPattern("yyyy-MM-ddThh:mm:ss"))
.atZone(ZoneId.systemDefault()).toLocalDateTime();
return LocalDateTime.parse(s, DateTimeFormatter.ofPattern("yyyy-MM-ddThh:mm:ss"));
}
throw new DatabaseException("Didn't understand date string: " + s);
}
@ -776,19 +755,6 @@ public class RowStub {
return (OffsetDateTime) o;
}
private ZonedDateTime toZonedDateTime(Object o) {
if (o instanceof String s) {
if (s.length() == "yyyy-MM-dd".length()) {
return ZonedDateTime.parse(s, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
}
if (s.length() == "yyyy-MM-ddThh:mm:ss".length()) {
return ZonedDateTime.parse(s, DateTimeFormatter.ofPattern("yyyy-MM-ddThh:mm:ss"));
}
throw new DatabaseException("Didn't understand date string: " + s);
}
return (ZonedDateTime) o;
}
private LocalDate toLocalDate(Object o) {
if (o instanceof String) {
return LocalDate.parse((String) o);

21
jdbc-test/src/main/java/org/xbib/jdbc/test/CommonTest.java
View file

@ -32,7 +32,6 @@ import java.time.Month;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
@ -70,8 +69,6 @@ public abstract class CommonTest {
protected OffsetDateTime offsetDateTimeNow;
protected ZonedDateTime zonedDateTimeNow;
protected abstract DatabaseProvider createDatabaseProvider(OptionsOverride options) throws Exception;
@BeforeEach
@ -79,7 +76,6 @@ public abstract class CommonTest {
localDateTimeNow = LocalDateTime.now().truncatedTo(ChronoUnit.MILLIS);
localDateNow = LocalDate.now();
offsetDateTimeNow = OffsetDateTime.now();
zonedDateTimeNow = ZonedDateTime.now();
dbp = createDatabaseProvider(new OptionsOverride() {
});
db = dbp.get();
@ -153,11 +149,10 @@ public abstract class CommonTest {
.addColumn("date_millis").asLocalDateTime().table()
.addColumn("local_date").asLocalDate().table()
.addColumn("offset_date_time").asOffsetDateTime().table()
.addColumn("tz_date_time").asZonedateTime().table()
.schema()
.execute(db);
BigDecimal bigDecimal = new BigDecimal("5.3");
db.toInsert("insert into dbtest values (?,?,?,?,?,?,?,?,?,?,?,?,?)")
db.toInsert("insert into dbtest values (?,?,?,?,?,?,?,?,?,?,?,?)")
.argInteger(1)
.argLong(2L)
.argFloat(3.2f)
@ -170,10 +165,9 @@ public abstract class CommonTest {
.argLocalDateTime(localDateTimeNow)
.argLocalDate(localDateNow)
.argOffsetDateTime(offsetDateTimeNow)
.argZonedDateTime(zonedDateTimeNow)
.insert(1);
db.toSelect("select nbr_integer, nbr_long, nbr_float, nbr_double, nbr_big_decimal, str_varchar, str_fixed, str_lob, "
+ "bin_blob, date_millis, local_date, offset_date_time, tz_date_time from dbtest")
+ "bin_blob, date_millis, local_date, offset_date_time from dbtest")
.query((RowsHandler<Void>) rs -> {
assertTrue(rs.next());
assertEquals(Integer.valueOf(1), rs.getIntegerOrNull(1));
@ -220,14 +214,11 @@ public abstract class CommonTest {
rs.getOffsetDateTimeOrNull(12).truncatedTo(ChronoUnit.SECONDS));
assertEquals(offsetDateTimeNow.truncatedTo(ChronoUnit.SECONDS),
rs.getOffsetDateTimeOrNull("offset_date_time").truncatedTo(ChronoUnit.SECONDS));
// org.postgresql.util.PSQLException: conversion to class java.time.ZonedDateTime from timestamptz not supported
// assertEquals(zonedDateTimeNow, rs.getZonedDateTimeOrNull(13));
// assertEquals(zonedDateTimeNow, rs.getZonedDateTimeOrNull("tz_date_time"));
return null;
});
// Repeat the above query, using the various methods that automatically infer the column
db.toSelect("select nbr_integer, nbr_long, nbr_float, nbr_double, nbr_big_decimal, str_varchar, str_fixed, str_lob, "
+ "bin_blob, date_millis, local_date, offset_date_time, tz_date_time from dbtest")
+ "bin_blob, date_millis, local_date, offset_date_time from dbtest")
.query((RowsHandler<Void>) rs -> {
assertTrue(rs.next());
assertEquals(Integer.valueOf(1), rs.getIntegerOrNull());
@ -242,12 +233,10 @@ public abstract class CommonTest {
assertEquals(localDateTimeNow, rs.getLocalDateTimeOrNull());
assertEquals(localDateNow, rs.getLocalDateOrNull());
assertEquals(offsetDateTimeNow.truncatedTo(ChronoUnit.SECONDS), rs.getOffsetDateTimeOrNull().truncatedTo(ChronoUnit.SECONDS));
// org.postgresql.util.PSQLException: conversion to class java.time.ZonedDateTime from timestamptz not supported
//assertEquals(zonedDateTimeNow, rs.getZonedDateTimeOrNull());
return null;
});
db.toSelect("select nbr_integer, nbr_long, nbr_float, nbr_double, nbr_big_decimal, str_varchar, str_fixed, str_lob, "
+ "bin_blob, date_millis, local_date, offset_date_time, tz_date_time from dbtest")
+ "bin_blob, date_millis, local_date, offset_date_time from dbtest")
.query((RowsHandler<Void>) rs -> {
assertTrue(rs.next());
assertEquals(1, rs.getIntegerOrZero());
@ -262,8 +251,6 @@ public abstract class CommonTest {
assertEquals(localDateTimeNow, rs.getLocalDateTimeOrNull());
assertEquals(localDateNow, rs.getLocalDateOrNull());
assertEquals(offsetDateTimeNow.truncatedTo(ChronoUnit.SECONDS), rs.getOffsetDateTimeOrNull().truncatedTo(ChronoUnit.SECONDS));
// org.postgresql.util.PSQLException: conversion to class java.time.ZonedDateTime from timestamptz not supported
//assertEquals(zonedDateTimeNow, rs.getZonedDateTimeOrNull());
return null;
});
db.toSelect("select str_lob, bin_blob from dbtest").query((RowsHandler<Void>) rs -> {