Revision: 6384
http://sourceforge.net/p/jump-pilot/code/6384
Author: michaudm
Date: 2020-08-20 07:17:48 +0000 (Thu, 20 Aug 2020)
Log Message:
-----------
Revert the fallback to FlexibleDateParser if rs.getTimestamp fails (useful for
sqlite ?)
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/datastore/jdbc/ValueConverterFactory.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2020-08-20 06:59:27 UTC (rev 6383)
+++ core/trunk/ChangeLog 2020-08-20 07:17:48 UTC (rev 6384)
@@ -5,7 +5,7 @@
#<-------------------------------- 80 chars
---------------------------------->#
2020-08-20 mmichaud <m.michael.mich...@orange.fr>
- * Fix regression : read dates from database as java.util.Date, not String
+ * #497 : read dates from database as java.util.Date, not String
* update postgresql and sqlite jdbc drivers
2020-08-17 Giuseppe Aruta
Modified:
core/trunk/src/com/vividsolutions/jump/datastore/jdbc/ValueConverterFactory.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/datastore/jdbc/ValueConverterFactory.java
2020-08-20 06:59:27 UTC (rev 6383)
+++
core/trunk/src/com/vividsolutions/jump/datastore/jdbc/ValueConverterFactory.java
2020-08-20 07:17:48 UTC (rev 6384)
@@ -119,22 +119,22 @@
public Object getValue(ResultSet rs, int columnIndex) throws
SQLException {
// always return string for dates and let FlexibleFeature
convert later during runtime
//return rs.getString(columnIndex);
-// Object ret = null;
-// try {
- return rs.getTimestamp(columnIndex);
-// if (rs.wasNull()) return null;
-// } catch (Exception e) {
-// // try to read date from string, as some SpatialDatabases
like SQLite
-// // can store DATE type in string
-// FlexibleDateParser parser = new FlexibleDateParser();
-// try {
-// ret = parser.parse(rs.getString(columnIndex), false);
-// } catch (Exception ee) {
-// System.err.println("cannot parse date value: \"" +
rs.getString(columnIndex)
-// + "\" Defaulting to null.\n" + ee.getMessage());
-// }
-// }
-// return ret;
+ Object ret = null;
+ try {
+ ret = rs.getTimestamp(columnIndex);
+ if (rs.wasNull()) return null;
+ } catch (Exception e) {
+ // try to read date from string, as some SpatialDatabases
like SQLite
+ // can store DATE type in string
+ FlexibleDateParser parser = new FlexibleDateParser();
+ try {
+ ret = parser.parse(rs.getString(columnIndex), false);
+ } catch (Exception ee) {
+ System.err.println("cannot parse date value: \"" +
rs.getString(columnIndex)
+ + "\" Defaulting to null.\n" + ee.getMessage());
+ }
+ }
+ return ret;
}
}
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
