Fixed Column Order for Insert. Insert String constructed in 1 loop.

Author: sproket

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.sproket</groupId>
     <artifactId>persism</artifactId>
-    <version>1.1.0b</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <build>

release-notes.md

@@ -1,5 +1,19 @@
 ## Release Notes
 
+### 1.1.0
+
+* Added support for Records! (Java 16)
+* Added preliminary support for Informix (looking for help to set up a vbox vm)
+* Fixed UPDATE statement using columns in alphabetical order (All Persism generated SQL should be in column order)
+* Fixed support for MSAccess with UCanAccess jdbc driver in Java 16
+* Fixed issue with Queries cached with missing columns
+* Fixed @Table name case sensitivity
+* Added warnings if Persism doesn't have results when querying for DatabaseMetaData
+
+### Breaking changes
+
+* Insert now returns a typed Result object containing the rows changed and modified data object for cases when you insert a Record and there are defaults or autoincs to assign.
+
 ### 1.0.3
 
 * Added support for MSAccess with UCanAccess jdbc driver (seems to be broken under Java 16 right now #13)

src/net/sf/persism/MetaData.java

@@ -10,6 +10,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.sql.*;
+import java.text.MessageFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -107,7 +108,7 @@ private synchronized <T> Map<String, PropertyInfo> determinePropertyInfo(Class<T
         try {
             st = connection.createStatement();
             // gives us real column names with case.
-            String sql = new StringBuilder().append("SELECT * FROM ").append(sd).append(tableName).append(ed).append(" WHERE 1=0").toString();
+            String sql = MessageFormat.format("SELECT * FROM {0}{1}{2} WHERE 1=0", sd, tableName, ed); // todo this is repeated - put the string in a static final
             if (log.isDebugEnabled()) {
                 log.debug("determineColumns: %s", sql);
             }
@@ -132,7 +133,8 @@ private synchronized <T> Map<String, PropertyInfo> determinePropertyInfo(Class<T
             Collection<PropertyInfo> properties = getPropertyInfo(objectClass);
 
             int columnCount = rsmd.getColumnCount();
-            Map<String, PropertyInfo> columns = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+            //Map<String, PropertyInfo> columns = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+            Map<String, PropertyInfo> columns = new LinkedHashMap<>(columnCount);
             for (int j = 1; j <= columnCount; j++) {
                 String realColumnName = rsmd.getColumnLabel(j);
                 String columnName = realColumnName.toLowerCase().replace("_", "").replace(" ", "");
@@ -382,9 +384,9 @@ private static synchronized <T> Collection<PropertyInfo> determinePropertyInfo(C
             if (Modifier.isStatic(field.getModifiers())) {
                 continue;
             }
-            log.debug("Field Name: %s", field.getName());
+//            log.debug("Field Name: %s", field.getName());
             String propertyName = field.getName();
-            log.debug("Property Name: *%s* ", propertyName);
+//            log.debug("Property Name: *%s* ", propertyName);
 
             PropertyInfo propertyInfo = new PropertyInfo();
             propertyInfo.propertyName = propertyName;
@@ -396,15 +398,15 @@ private static synchronized <T> Collection<PropertyInfo> determinePropertyInfo(C
 
             for (Method method : methods) {
                 String propertyNameToTest = field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
-                log.debug("property name for testing %s", propertyNameToTest);
+                // log.debug("property name for testing %s", propertyNameToTest);
                 if (propertyNameToTest.startsWith("Is") && propertyNameToTest.length() > 2 && Character.isUpperCase(propertyNameToTest.charAt(2))) {
                     propertyNameToTest = propertyName.substring(2);
                 }
 
                 String[] candidates = {"set" + propertyNameToTest, "get" + propertyNameToTest, "is" + propertyNameToTest, field.getName()};
 
                 if (Arrays.asList(candidates).contains(method.getName())) {
-                    log.debug("  METHOD: %s", method.getName());
+                    //log.debug("  METHOD: %s", method.getName());
 
                     annotations = method.getAnnotations();
                     for (Annotation annotation : annotations) {
@@ -476,7 +478,7 @@ private void populateTableList(Connection con) throws PersismException {
     String getUpdateStatement(Object object, Connection connection) throws PersismException, NoChangesDetectedForUpdateException {
 
         if (object instanceof Persistable) {
-            Map<String, PropertyInfo> changes = getChangedProperties((Persistable) object, connection);
+            Map<String, PropertyInfo> changes = getChangedProperties((Persistable<?>) object, connection);
             if (changes.size() == 0) {
                 throw new NoChangesDetectedForUpdateException();
             }
@@ -549,8 +551,13 @@ private synchronized String determineInsertStatement(Object object, Connection c
 
             Map<String, ColumnInfo> columns = getColumns(object.getClass(), connection);
             Map<String, PropertyInfo> properties = getTableColumnsPropertyInfo(object.getClass(), connection);
-            StringBuilder sb = new StringBuilder();
-            sb.append("INSERT INTO ").append(sd).append(tableName).append(ed).append(" (");
+
+            StringBuilder sbi = new StringBuilder();
+            sbi.append("INSERT INTO ").append(sd).append(tableName).append(ed).append(" (");
+
+            StringBuilder sbp = new StringBuilder();
+            sbp.append(") VALUES (");
+
             String sep = "";
             boolean saveInMap = true;
 
@@ -568,31 +575,17 @@ private synchronized String determineInsertStatement(Object object, Connection c
                         }
 
                     }
-                    sb.append(sep).append(sd).append(column.columnName).append(ed);
-                    sep = ", ";
-                }
-            }
-            sb.append(") VALUES (");
-            sep = "";
-            for (ColumnInfo column : columns.values()) {
-                if (!column.autoIncrement) {
 
-                    if (column.hasDefault) {
-                        // Do not include if this column has a default and no value has been
-                        // set on it's associated property.
-                        if (properties.get(column.columnName).getter.invoke(object) == null) {
-                            continue;
-                        }
-                    }
-
-                    sb.append(sep).append(" ? ");
+                    sbi.append(sep).append(sd).append(column.columnName).append(ed);
+                    sbp.append(sep).append("?");
                     sep = ", ";
                 }
             }
-            sb.append(") ");
+
+            sbi.append(sbp).append(") ");
 
             String insertStatement;
-            insertStatement = sb.toString();
+            insertStatement = sbi.toString();
 
             if (log.isDebugEnabled()) {
                 log.debug("determineInsertStatement for %s is %s", object.getClass(), insertStatement);
@@ -733,10 +726,10 @@ private String buildUpdateString(Object object, Iterator<String> it, Connection
         return sb.toString();
     }
 
-    Map<String, PropertyInfo> getChangedProperties(Persistable persistable, Connection connection) throws PersismException {
+    Map<String, PropertyInfo> getChangedProperties(Persistable<?> persistable, Connection connection) throws PersismException {
 
         try {
-            Persistable original = (Persistable) persistable.readOriginalValue();
+            Persistable<?> original = (Persistable<?>) persistable.readOriginalValue();
 
             Map<String, PropertyInfo> columns = getTableColumnsPropertyInfo(persistable.getClass(), connection);
 

src/net/sf/persism/Reader.java

@@ -68,7 +68,7 @@ <T> T readObject(Object object, ResultSet rs) throws IllegalAccessException, SQL
         for (int j = 1; j <= columnCount; j++) {
 
             String columnName = rsmd.getColumnLabel(j);
-            PropertyInfo columnProperty = properties.get(columnName);
+            PropertyInfo columnProperty = getPropertyInfo(columnName, properties); //properties.get(columnName);
 
             if (columnProperty != null) {
                 Class<?> returnType = columnProperty.getter.getReturnType();
@@ -388,4 +388,15 @@ <T> T readColumn(ResultSet rs, int column, Class<?> returnType) throws SQLExcept
 
         return (T) value;
     }
+
+    // Poor man's case insensitive linked hash map ;)
+    private PropertyInfo getPropertyInfo(String col, Map<String, PropertyInfo> properties) {
+        for (String key : properties.keySet()) {
+            if (key.equalsIgnoreCase(col)) {
+                return properties.get(key);
+            }
+        }
+        return null;
+    }
+
 }

test/mssql.properties

@@ -1,6 +1,7 @@
 # datasource properties used in junit test and development
 # Note -Djsse.enableCBCProtection=false needed as java runtime param to make SQL connections work.
-database.url=jdbc:sqlserver://pinf-win;databaseName=PINF
+#database.url=jdbc:sqlserver://pinf-win;databaseName=PINF
+database.url=jdbc:sqlserver://localhost;databaseName=PINF
 #database.url=jdbc:sqlserver://192.168.1.116;databaseName=PINF
 database.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 database.username=pinf

test/net/sf/persism/BaseTest.java

@@ -464,7 +464,9 @@ public void testContactTable() throws SQLException {
                 Contact contactForTest = getContactForTest();
                 contactForTest.setIdentity(randomUUID);
                 session.insert(contactForTest);
+                contactForTest.setAddress1("123 Somewhere");
                 contactForTest.setContactName("HELLO?!");
+                contactForTest.setNotes("notes?");
                 session.update(contactForTest);
                 session.fetch(contactForTest);