Altered toUpdate() method to use dialect form. Changed unit test to use

lower case id names.

Author: dessalines

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

@@ -2692,6 +2692,23 @@ public void manageTime(boolean manage) {
     public String toInsert() {
         return toInsert(getMetaModelLocal().getDialect());
     }
+        
+
+    /**
+     * Generates INSERT SQL based on this model with the provided dialect.
+     * Example:
+     * <pre>
+     * String insert = u.toInsert(new MySQLDialect());
+     * //yields this output:
+     * //INSERT INTO users (id, first_name, email, last_name) VALUES (1, 'Marilyn', 'mmonroe@yahoo.com', 'Monroe');
+     * </pre>
+     *
+     * @param dialect dialect to be used to generate the SQL
+     * @return INSERT SQL based on this model.
+     */
+    public String toInsert(Dialect dialect) {
+        return dialect.insert(getMetaModelLocal(), attributes);
+    }
 
     /**
      * Generates UPDATE SQL based on this model. Uses single quotes for all string values.
@@ -2705,70 +2722,24 @@ public String toInsert() {
      *
      * @return UPDATE SQL based on this model.
      */
-    public String toUpdate(){
-
-    	doUpdatedAt();
-
-    	MetaModel metaModel = getMetaModelLocal();
-    	StringBuilder query = new StringBuilder().append("UPDATE ").append(metaModel.getTableName()).append(" SET ");
-    	SortedSet<String> attributeNames = metaModel.getAttributeNamesSkipGenerated(manageTime);
-
-    	
-
-    	List<Object> values = getAttributeValues(attributeNames);
-    	List<String> attributeNamesList = new ArrayList<String>(attributeNames);
-    	for (int i = 0; i < values.size(); i++) {
-    		Object value = values.get(i);
-    		String attributeName = attributeNamesList.get(i);
-    		if (value != null) {
-    			query.append(attributeName + " = " + "'" + value + "'");
-    			
-    			if (i < values.size() -1) {
-    				query.append(" , ");
-    			}
-    		}
-    	}
-        	
-
-    	if (manageTime && metaModel.hasAttribute("updated_at")) {
-    		query.append(", updated_at = ?");
-    		values.add(get("updated_at"));
-    	}
-
-    	if(metaModel.isVersioned()){
-    		query.append(", ").append(getMetaModelLocal().getVersionColumn()).append(" = ?");
-    		values.add(getLong(getMetaModelLocal().getVersionColumn()) + 1);
-    	}
-    	query.append(" WHERE ").append(metaModel.getIdName()).append(" = " + getId());
-    	values.add(getId());
-    	
-    	
-    	if (metaModel.isVersioned()) {
-    		query.append(" AND ").append(getMetaModelLocal().getVersionColumn()).append(" = ?");
-    		values.add(get(getMetaModelLocal().getVersionColumn()));
-    	}
-
-    	if(metaModel.cached()){
-    		QueryCache.instance().purgeTableCache(metaModel.getTableName());
-    	}
-    	return query.toString();
+    public String toUpdate() {
+        return toUpdate(getMetaModelLocal().getDialect());
     }
 
-
     /**
-     * Generates INSERT SQL based on this model with the provided dialect.
+     * Generates UPDATE SQL based on this model. Uses single quotes for all string values.
      * Example:
      * <pre>
-     * String insert = u.toInsert(new MySQLDialect());
+     *
+     * String update = u.toUpdate();
      * //yields this output:
-     * //INSERT INTO users (id, first_name, email, last_name) VALUES (1, 'Marilyn', 'mmonroe@yahoo.com', 'Monroe');
+     * //UPDATE students SET DOB = '1965-12-01' , FIRST_NAME = 'Jim' , LAST_NAME = 'Cary' WHERE id = 1
      * </pre>
      *
-     * @param dialect dialect to be used to generate the SQL
-     * @return INSERT SQL based on this model.
+     * @return UPDATE SQL based on this model.
      */
-    public String toInsert(Dialect dialect) {
-        return dialect.insert(getMetaModelLocal(), attributes);
+    public String toUpdate(Dialect dialect) {
+        return dialect.update(getMetaModelLocal(), attributes);
     }
 
     /**

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

@@ -219,4 +219,36 @@ public String insert(MetaModel metaModel, Map<String, Object> attributes) {
         }
         return query.toString();
     }
+    
+    @Override
+    public String update(MetaModel metaModel, Map<String, Object> attributes) {
+    	  StringBuilder query = new StringBuilder().append("UPDATE ").append(metaModel.getTableName()).append(' ');
+          if (attributes.isEmpty()) {
+              appendEmptyRow(metaModel, query);
+          } else {
+        	     
+        	  query.append("SET ");
+        	     
+        	  Iterator<String> keysetIt = attributes.keySet().iterator();
+              Iterator<Object> valueIt = attributes.values().iterator();
+         
+              while (valueIt.hasNext()) {
+            	  query.append(keysetIt.next() + " = ");
+            	  appendValue(query, valueIt.next()); // Accomodates the different types
+            	  
+            	  if (valueIt.hasNext()) {
+            		  query.append(", ");
+            	  } else{
+            		  query.append(" ");
+            	  }
+              }
+              
+              String idName = metaModel.getIdName();
+              query.append("WHERE ").append(idName).append(" = " + attributes.get(idName));
+          
+
+          }
+          return query.toString();
+    }
+
 }

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

@@ -51,4 +51,7 @@ public interface Dialect {
     String deleteManyToManyAssociation(Many2ManyAssociation association);
 
     String insert(MetaModel metaModel, Map<String, Object> attributes);
+    
+    String update(MetaModel metaModel, Map<String, Object> attributes);
+    
 }

activejdbc/src/test/java/org/javalite/activejdbc/ModelTest.java

@@ -493,7 +493,7 @@ public void shouldGenerateCorrectUpdateSQL(){
         String updateSQL = s.toUpdate();
         System.out.println(updateSQL);
 
-        the(updateSQL).shouldBeEqual("UPDATE students SET DOB = '1965-12-01' , FIRST_NAME = 'Jim' , LAST_NAME = 'Cary' WHERE id = 1");
+        the(updateSQL).shouldBeEqual("UPDATE students SET dob = DATE '1965-12-01', first_name = 'Jim', id = 1, last_name = 'Cary' WHERE id = 1");
 }
 
     @Test