#334 Corrections for insert with @idgenerator

Author: ericbn

activejdbc/src/main/java/org/javalite/activejdbc/DB.java

@@ -597,27 +597,25 @@ Object execInsert(String query, String autoIncrementColumnName, Object... params
                 ps = connection.prepareStatement(query, new String[]{autoIncrementColumnName});
                 StatementCache.instance().cache(connection, query, ps);
             }
-            for (int index = 0; index < params.length; index++) {
-                Object param = params[index];
+            for (int index = 0; index < params.length;) {
+                Object param = params[index++];
                 if (param instanceof byte[]) {
                     byte[] bytes = (byte[]) param;
                     try {
                         Blob blob = connection.createBlob();
                         if (blob == null) { // SQLite
-                            ps.setBytes(index + 1, bytes);
+                            ps.setBytes(index, bytes);
                         } else {
                             blob.setBytes(1, bytes);
-                            ps.setBlob(index + 1, blob);
+                            ps.setBlob(index, blob);
                         }
                     } catch (AbstractMethodError e) {// net.sourceforge.jtds.jdbc.ConnectionJDBC2.createBlob is abstract :)
-                        ps.setObject(index + 1, param);
-                    } catch (SQLFeatureNotSupportedException e) {
-                        ps.setObject(index + 1, param);
+                        ps.setObject(index, param);
                     } catch (SQLException e) {
-                        ps.setObject(index + 1, param);
+                        ps.setObject(index, param);
                     }
-                }else{
-                    ps.setObject(index + 1, param);
+                } else {
+                    ps.setObject(index, param);
                 }
             }
 

activejdbc/src/main/java/org/javalite/activejdbc/Model.java

@@ -2567,13 +2567,8 @@ public boolean insert() {
         doUpdatedAt();
 
         MetaModel metaModel = getMetaModelLocal();
-        boolean containsId = (attributes.get(metaModel.getIdName()) != null);
         List<String> columns = new ArrayList<String>();
         List<Object> values = new ArrayList<Object>();
-        if (!containsId && metaModel.getIdGeneratorCode() != null) {
-            columns.add(metaModel.getIdName());
-            values.add(metaModel.getIdGeneratorCode());
-        }
         for (Map.Entry<String, Object> entry : attributes.entrySet()) {
             if (entry.getValue() == null || metaModel.getVersionColumn().equals(entry.getKey())) {
                 continue;
@@ -2589,13 +2584,14 @@ public boolean insert() {
         //TODO: need to invoke checkAttributes here too, and maybe rely on MetaModel for this.
 
         try {
+            boolean containsId = attributes.containsKey(metaModel.getIdName());
             boolean done;
-            String query = metaModel.getDialect().insertParametrized(metaModel, columns);
+            String query = metaModel.getDialect().insertParametrized(metaModel, columns, containsId);
             if (containsId) {
                 done = (1 == new DB(metaModel.getDbName()).exec(query, values.toArray()));
             } else {
                 Object id = new DB(metaModel.getDbName()).execInsert(query, getIdName(), values.toArray());
-                attributes.put(getIdName(), id);
+                attributes.put(metaModel.getIdName(), id);
                 done = (id != null);
             }
             if (metaModel.cached()) {

activejdbc/src/main/java/org/javalite/activejdbc/dialects/DefaultDialect.java

@@ -163,14 +163,21 @@ public String insertManyToManyAssociation(Many2ManyAssociation association) {
     }
 
     @Override
-    public String insertParametrized(MetaModel metaModel, List<String> columns) {
+    public String insertParametrized(MetaModel metaModel, List<String> columns, boolean containsId) {
         StringBuilder query = new StringBuilder().append("INSERT INTO ").append(metaModel.getTableName()).append(' ');
         if (columns.isEmpty()) {
             appendEmptyRow(metaModel, query);
         } else {
+            boolean addIdGeneratorCode = (!containsId && metaModel.getIdGeneratorCode() != null);
             query.append('(');
+            if (addIdGeneratorCode) {
+                query.append(metaModel.getIdName()).append(", ");
+            }
             join(query, columns, ", ");
             query.append(") VALUES (");
+            if (addIdGeneratorCode) {
+                query.append(metaModel.getIdGeneratorCode()).append(", ");
+            }
             appendQuestions(query, columns.size());
             query.append(')');
         }
@@ -217,9 +224,17 @@ public String insert(MetaModel metaModel, Map<String, Object> attributes) {
         if (attributes.isEmpty()) {
             appendEmptyRow(metaModel, query);
         } else {
+            boolean addIdGeneratorCode = (!attributes.containsKey(metaModel.getIdName())
+                    && metaModel.getIdGeneratorCode() != null);
             query.append('(');
+            if (addIdGeneratorCode) {
+                query.append(metaModel.getIdName()).append(", ");
+            }
             join(query, attributes.keySet(), ", ");
             query.append(") VALUES (");
+            if (addIdGeneratorCode) {
+                query.append(metaModel.getIdGeneratorCode()).append(", ");
+            }
             Iterator<Object> it = attributes.values().iterator();
             appendValue(query, it.next());
             while (it.hasNext()) {

activejdbc/src/main/java/org/javalite/activejdbc/dialects/Dialect.java

@@ -46,12 +46,12 @@ public interface Dialect {
 
     String insertManyToManyAssociation(Many2ManyAssociation association);
 
-    String insertParametrized(MetaModel metaModel, List<String> columns);
+    String insertParametrized(MetaModel metaModel, List<String> columns, boolean containsId);
 
     String deleteManyToManyAssociation(Many2ManyAssociation association);
 
     String insert(MetaModel metaModel, Map<String, Object> attributes);
-    
+
     String update(MetaModel metaModel, Map<String, Object> attributes);
-    
+
 }

activejdbc/src/main/java/org/javalite/activejdbc/dialects/OracleDialect.java

@@ -78,7 +78,9 @@ public String formSelect(String tableName, String subQuery, List<String> orderBy
 
     @Override
     protected void appendEmptyRow(MetaModel metaModel, StringBuilder query) {
-        query.append('(').append(metaModel.getIdName()).append(") VALUES (null)");
+        query.append('(').append(metaModel.getIdName()).append(") VALUES (")
+                .append(metaModel.getIdGeneratorCode() != null ? metaModel.getIdGeneratorCode() : "NULL")
+                .append(')');
     }
 
     @Override