- Fixed critical bug in the javaxt.sql.Recordset class retrieving records from a PostgreSQL database with the setFetchSize() method.

pborissow · pborissow · commit 71292304ac84 · 2015-02-06T10:25:23.000Z
- Added new javaxt.sql.Value.toDate() method to make it easier to retrieve arrays.
 - Updated logic in the Value.toDate() to improve performance.

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@680 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/sql/Recordset.java b/src/javaxt/sql/Recordset.java
@@ -385,24 +385,22 @@ else if (driver.equals("DB2")){
   /**  Closes the Recordset freeing up database and jdbc resources.   */
     
     public void close(){
+
         if (State==1){
             try{
                 executeBatch();
                 rs.close();
                 stmt.close();
                 State = 0;
+                Conn.setAutoCommit(autoCommit);
             }
             catch(java.sql.SQLException e){
                 e.printStackTrace();
             }
         }
 
 
-      //Restore autoCommit setting
-        try{
-            Conn.setAutoCommit(autoCommit);
-        }
-        catch(Exception e){}
+
 
 
         rs = null;
@@ -892,8 +890,10 @@ private int executeBatch() throws java.sql.SQLException{
 
             int[] rowsUpdated = stmt.executeBatch();
             if (rowsUpdated.length>0) ttl+=rowsUpdated.length;
-            
-            Conn.commit();
+
+            if (Conn.getAutoCommit()==false){
+                Conn.commit();
+            }
         }
         batchedStatements.clear();
         numBatches = 0;
@@ -1155,10 +1155,12 @@ public boolean moveNext(){
                 }
             }
             catch(Exception e){
+                EOF = true;
+                return false;
                 //System.out.println("ERROR MoveNext: " + e.toString());
             }
         }        
-        return false;
+        //return false;
     }
 
 
@@ -1372,14 +1374,14 @@ public int getRecordCount(){
     }
 
 
-  //**************************************************************************
-  //** Finalize
-  //**************************************************************************
-  /** Method *should* be called by Java garbage collector once this class is
-   *  disposed.
-   */
-    protected void finalize() throws Throwable {
-       close();
-       super.finalize();
-    }
+//  //**************************************************************************
+//  //** Finalize
+//  //**************************************************************************
+//  /** Method *should* be called by Java garbage collector once this class is
+//   *  disposed.
+//   */
+//    protected void finalize() throws Throwable {
+//       close();
+//       super.finalize();
+//    }
 }
diff --git a/src/javaxt/sql/Value.java b/src/javaxt/sql/Value.java
@@ -22,8 +22,29 @@ protected Value(Object value){
     }
 
     public java.sql.Timestamp toTimeStamp(){
-        javaxt.utils.Date date = toDate();
-        if (date==null) return null;
-        else return new java.sql.Timestamp(date.getDate().getTime());
+        Object obj = super.toObject();
+        if (obj!=null){
+            if (obj instanceof java.sql.Timestamp){
+                return (java.sql.Timestamp) obj;
+            }
+            else{
+                javaxt.utils.Date date = toDate();
+                return new java.sql.Timestamp(date.getDate().getTime());
+            }
+        }
+        return null;
+    }
+
+    public Object toArray(){
+        Object obj = super.toObject();
+        if (obj!=null){
+            try{
+                return ((java.sql.Array) obj).getArray();
+            }
+            catch(Exception e){
+            }
+        }
+
+        return null;
     }
 }
diff --git a/src/javaxt/utils/Value.java b/src/javaxt/utils/Value.java
@@ -137,13 +137,26 @@ public Float toFloat(){
    *  converting the value to a Date or if the value is null.
    */
     public javaxt.utils.Date toDate(){
-        if (value==null) return null;
-        try{
-            return new javaxt.utils.Date(value.toString());
-        }
-        catch(Exception e){
-            return null;
+        if (value!=null){
+            if (value instanceof java.sql.Timestamp){
+                java.sql.Timestamp ts = (java.sql.Timestamp) value;
+                return new javaxt.utils.Date(ts.getTime());
+            }
+            else if (value instanceof java.util.Date){
+                return new javaxt.utils.Date((java.util.Date) value);
+            }
+            else if (value instanceof java.util.Calendar){
+                return new javaxt.utils.Date((java.util.Calendar) value);
+            }
+            else{
+                try{
+                    return new javaxt.utils.Date(value.toString());
+                }
+                catch(Exception e){
+                }
+            }
         }
+        return null;
     }
 
     
