#365 Corrected Model.hydrate() to be case-insensitive

using the case-insensitive attributeNames set of the model

Author: ericbn

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

@@ -155,22 +155,14 @@ public <T extends Model> T fromMap(Map input) {
      * @param attributesMap map containing values for this instance.
      */
     protected void hydrate(Map<String, Object> attributesMap) {
-        for (String attrName : getMetaModelLocal().getAttributeNames()) {
-            Object value = null;
-            boolean contains = false;
-            if (attributesMap.containsKey(attrName.toLowerCase())) {
-                value = attributesMap.get(attrName.toLowerCase());
-                contains = true;
-            } else if (attributesMap.containsKey(attrName.toUpperCase())) {
-                value = attributesMap.get(attrName.toUpperCase());
-                contains = true;
-            }
-            if (contains) {
-                if (value instanceof Clob && getMetaModelLocal().cached()) {
-                    this.attributes.put(attrName, Convert.toString(value));
-                }else {
-                    this.attributes.put(attrName, getMetaModelLocal().getDialect().overrideDriverTypeConversion(
-                            getMetaModelLocal(), attrName, value));
+        Set<String> attributeNames = getMetaModelLocal().getAttributeNames();
+        for (Map.Entry<String, Object> entry : attributesMap.entrySet()) {
+            if (attributeNames.contains(entry.getKey())) {
+                if (entry.getValue() instanceof Clob && getMetaModelLocal().cached()) {
+                    this.attributes.put(entry.getKey(), Convert.toString(entry.getValue()));
+                } else {
+                    this.attributes.put(entry.getKey(), getMetaModelLocal().getDialect().overrideDriverTypeConversion(
+                            getMetaModelLocal(), entry.getKey(), entry.getValue()));
                 }
             }
         }

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

@@ -618,4 +618,13 @@ public void testNewFromMap() {
         a(p.isNew()).shouldBeTrue();
         a(p.isValid()).shouldBeTrue();
     }
+
+    @Test
+    public void testNewFromMapCaseInsensive() {
+        Person p = new Person().fromMap(map("NAME", "Joe", "Last_Name", "Schmoe", "dob", "2003-06-15"));
+
+        a(p.get("name")).shouldNotBeNull();
+        a(p.get("last_name")).shouldNotBeNull();
+        a(p.get("dob")).shouldNotBeNull();
+    }
 }