- Fixed bug retrieving generated keys after insert

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1561 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff

Author: pborissow

src/javaxt/sql/Recordset.java

@@ -784,7 +784,16 @@ public void update() throws SQLException {
         }
         else{
             try{
-                stmt = conn.prepareStatement(sql.toString(), java.sql.Statement.RETURN_GENERATED_KEYS);
+                if (keys==null || keys.isEmpty()){
+                    stmt = conn.prepareStatement(sql.toString(), java.sql.Statement.RETURN_GENERATED_KEYS);
+                }
+                else{
+                    String[] columnNames = new String[keys.size()];
+                    for (int i=0; i<columnNames.length; i++){
+                        columnNames[i] = keys.get(i).toString();
+                    }
+                    stmt = conn.prepareStatement(sql.toString(), columnNames);
+                }
             }
             catch(Exception e){ //not all databases support auto generated keys
                 stmt = conn.prepareStatement(sql.toString());
@@ -800,6 +809,18 @@ public void update() throws SQLException {
         if (batchSize==1){
             try{
                 stmt.executeUpdate();
+
+                if (InsertOnUpdate){
+                    try (java.sql.ResultSet generatedKeys = stmt.getGeneratedKeys()) {
+                        if (generatedKeys.next()) {
+                            this.GeneratedKey = new Value(generatedKeys.getString(1));
+                        }
+                    }
+                    catch(Exception e){
+                        //not all databases support auto generated keys
+                    }
+                }
+
                 stmt.close();
             }
             catch(SQLException e){
@@ -824,21 +845,7 @@ public void update() throws SQLException {
             }
 
 
-            if (InsertOnUpdate){
-                try{
-                    java.sql.ResultSet generatedKeys = stmt.getGeneratedKeys();
-                    if (generatedKeys.next()) {
-                        this.GeneratedKey = new Value(generatedKeys.getString(1));
-                    }
-                }
-                catch(Exception e){
-                    //not all databases support auto generated keys
-                }
-                finally{
-                    stmt.close();
-                }
-                InsertOnUpdate = false;
-            }
+            if (InsertOnUpdate) InsertOnUpdate = false;
 
         }
         else{