Backpatch jdbc2 fixes to jdbc1, ANT fixes, from Peter Eisentraut

diff --git a/contrib/retep/build.xml b/contrib/retep/build.xml
index 8ab11c47f73f8e0c3c130150c0b76bc10120e624..0b3342f96829c3e905488aa74db71e5cfa4ea1d4 100644 (file)
--- a/contrib/retep/build.xml
+++ b/contrib/retep/build.xml
@@ -2,7 +2,7 @@
 
   build file to build the donated retep tools packages
 
-  $Id: build.xml,v 1.4 2001/03/11 11:06:59 petere Exp $
+  $Id: build.xml,v 1.5 2001/05/16 16:20:51 momjian Exp $
 
 -->
 
@@ -22,6 +22,11 @@
     
   
 
+  
+    
+  
+
+
   
   
     
@@ -35,7 +40,7 @@
   
 
   
-  
+  ,warning" if="jdk1.2+">
     
       
     

diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml
index 54ed7144196bdec214865da6a5e10e25b0c76cba..ac18c5331a0eff4a1271f82b06afb74af2079f1d 100644 (file)
--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -3,7 +3,7 @@
   build file to allow ant (http://jakarta.apache.org/ant/) to be used
   to build the PostgreSQL JDBC Driver.
 
-  $Id: build.xml,v 1.8 2001/03/11 11:07:00 petere Exp $
+  $Id: build.xml,v 1.9 2001/05/16 16:20:52 momjian Exp $
 
 -->
 
@@ -120,6 +120,7 @@
     
       
       
+      
     
   
 

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java b/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
index 8bdb67cb2895f943296a7897b60a36c33fdf87e7..6c93c7a27646198a3f3d6e5d08ca347b051cc6b2 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/ResultSet.java
@@ -227,7 +227,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
    */
   public short getShort(int columnIndex) throws SQLException
   {
-    String s = getString(columnIndex);
+    String s = getFixedString(columnIndex);
     
     if (s != null)
       {
@@ -250,7 +250,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
    */
   public int getInt(int columnIndex) throws SQLException
   {
-    String s = getString(columnIndex);
+    String s = getFixedString(columnIndex);
     
     if (s != null)
       {
@@ -273,7 +273,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
    */
   public long getLong(int columnIndex) throws SQLException
   {
-    String s = getString(columnIndex);
+    String s = getFixedString(columnIndex);
     
     if (s != null)
       {
@@ -296,7 +296,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
    */
   public float getFloat(int columnIndex) throws SQLException
   {
-    String s = getString(columnIndex);
+    String s = getFixedString(columnIndex);
     
     if (s != null)
       {
@@ -319,7 +319,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
    */
   public double getDouble(int columnIndex) throws SQLException
   {
-    String s = getString(columnIndex);
+    String s = getFixedString(columnIndex);
     
     if (s != null)
       {
@@ -344,7 +344,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
    */
   public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException
   {
-    String s = getString(columnIndex);
+    String s = getFixedString(columnIndex);
     BigDecimal val;
     
     if (s != null)
@@ -412,12 +412,7 @@ public class ResultSet extends org.postgresql.ResultSet implements java.sql.Resu
     String s = getString(columnIndex);
     if(s==null)
       return null;
-    SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-    try {
-      return new java.sql.Date(df.parse(s).getTime());
-    } catch (ParseException e) {
-      throw new PSQLException("postgresql.res.baddate",new Integer(e.getErrorOffset()),s);
-    }
+    return java.sql.Date.valueOf(s);
   }
   
   /**

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java b/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java
index d37350cc8c4f6957e255cffbdef0d4ea6266aacb..889b3a72e3ddff04e0fab6b1134dc7d9fe985dac 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java
@@ -22,7 +22,7 @@ import org.postgresql.util.PSQLException;
  * @see java.sql.Statement
  * @see ResultSet
  */
-public class Statement implements java.sql.Statement
+public class Statement extends org.postgresql.Statement implements java.sql.Statement
 {
     Connection connection;     // The connection who created us
     java.sql.ResultSet result = null;  // The current results