35 lines
1007 B
Plaintext
35 lines
1007 B
Plaintext
--- src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java~ Fri Feb 23 19:12:23 2001
|
|
+++ src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java Wed May 9 04:31:11 2001
|
|
@@ -423,8 +423,13 @@
|
|
String s = getString(columnIndex);
|
|
if(s==null)
|
|
return null;
|
|
-
|
|
- return java.sql.Date.valueOf(s);
|
|
+ // length == 10: SQL Date
|
|
+ // length > 10: SQL Timestamp, assumes PGDATESTYLE=ISO
|
|
+ try {
|
|
+ return java.sql.Date.valueOf((s.length() == 10) ? s : s.substring(0,10));
|
|
+ } catch (NumberFormatException e) {
|
|
+ throw new PSQLException("postgresql.res.baddate", s);
|
|
+ }
|
|
}
|
|
|
|
/**
|
|
@@ -441,8 +446,13 @@
|
|
|
|
if(s==null)
|
|
return null; // SQL NULL
|
|
-
|
|
- return java.sql.Time.valueOf(s);
|
|
+ // length == 8: SQL Time
|
|
+ // length > 8: SQL Timestamp
|
|
+ try {
|
|
+ return java.sql.Time.valueOf((s.length() == 8) ? s : s.substring(11,19));
|
|
+ } catch (NumberFormatException e) {
|
|
+ throw new PSQLException("postgresql.res.badtime",s);
|
|
+ }
|
|
}
|
|
|
|
/**
|