Merge pull request #973 from cschabl/bugfix-reading-static-model-data

#968 Bugfix reading static model data
javalite · Oct 29, 2019 · ec84c67 · ec84c67
2 parents b8009f9 + e51dbe8
commit ec84c67
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/activejdbc-static-metadata-test/pom.xml b/activejdbc-static-metadata-test/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jdbc.driver>org.h2.Driver</jdbc.driver>
-        <jdbc.url>jdbc:h2:${project.basedir}/target/test-db;DATABASE_TO_UPPER=false</jdbc.url>
+        <jdbc.url>jdbc:h2:${project.basedir}/target/test-db</jdbc.url>
         <jdbc.user>sa</jdbc.user>
         <jdbc.password />
         <db>h2</db>

diff --git a/...vejdbc-static-metadata-test/src/test/java/org/javalite/activejdbc/StaticMetadataSpec.java b/...vejdbc-static-metadata-test/src/test/java/org/javalite/activejdbc/StaticMetadataSpec.java
@@ -8,6 +8,7 @@
 import java.util.List;
 
 import static org.javalite.test.jspec.JSpec.a;
+import static org.javalite.test.jspec.JSpec.the;
 
 public class StaticMetadataSpec {
 
@@ -35,6 +36,8 @@ public void shouldStoreAndReceiveModel() {
 
         library.saveIt();
 
+        the(library.getLongId()).shouldNotBeNull();
+
         library.add(book);
         a(Book.find("author = ?", "me").size()).shouldEqual(1);
         List<Library> libraryList = Library.find("city = ?", "Chicago");

diff --git a/activejdbc/src/main/java/org/javalite/activejdbc/MetaModels.java b/activejdbc/src/main/java/org/javalite/activejdbc/MetaModels.java
@@ -147,7 +147,7 @@ protected void fromJSON(String json) {
                         (String) metaModelMap.get(DB_TYPE)
                 );
 
-                Map<String, ColumnMetadata> columnMetadataMap = new HashMap<>();
+                Map<String, ColumnMetadata> columnMetadataMap = new CaseInsensitiveMap<>();
                 ((Map) metaModelMap.getOrDefault(COLUMN_METADATA, map())).forEach((column, map) -> {
                     Map metadata = (Map) map;
                     columnMetadataMap.put(