automatic column mapping

Author: slowcoders

hyperql-spring-lib/src/main/java/org/slowcoders/hyperql/jdbc/storage/JdbcSchema.java

@@ -215,7 +215,7 @@ private void dumpColumnDefinition(QColumn col, SourceWriter sb, boolean isJPA) {
                 sb.writeln("@org.hibernate.annotations.Type(io.hypersistence.utils.hibernate.type.json.JsonType.class)");
             }
         } else {
-            sb.write("@QColumn(").writeQuoted(col.getPhysicalName()).write(")\n");
+            // sb.write("@QColumn(").writeQuoted(col.getPhysicalName()).write(")\n");
         }
 
         String fieldName = isJPA ? getJavaFieldName(col)

hyperquery/src/main/java/org/slowcoders/hyperquery/core/QColumn.java

@@ -6,7 +6,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface QColumn {
-    String value();
-    String inputTransform() default "?";
-    String outputTransform() default "?";
+    String name();
+    String writeTransform() default "?";
+    String readTransform() default "?";
 }

hyperquery/src/main/java/org/slowcoders/hyperquery/impl/HSchema.java

@@ -108,6 +108,9 @@ else if (QAttribute.class.isAssignableFrom(propertyType)) {
                     ((AliasNode)attr).setName(f.getName());
                     attributes.put(f.getName(), attr);
                 }
+                else {
+
+                }
             }
         } catch (IllegalAccessException e) {
             throw new RuntimeException(e);
@@ -195,61 +198,27 @@ public QJoin getJoin(String join, JdbcConnector dbConn) {
     public String getColumnExpr(Field f) {
         String columnExpr = Helper.getColumnName(f);
         if (columnExpr != null) return columnExpr;
+        String name = f.getName();
         if (this.attributes != null) {
-            QAttribute attr = this.attributes.get(f.getName());
+            QAttribute attr = this.attributes.get(name);
             if (attr != null) return attr.getEncodedExpr();
         }
-        return null;
+        for (JdbcColumn col : jdbcColumns) {
+            if (name.equals(col.getFieldName())) {
+                return col.getPhysicalName();
+            }
+        }
+        QJoin join = this.joins.get("@" + name);
+        if (join != null) {
+            return "@" + name;
+        }
+        throw new RuntimeException("Cannot find column expression for " + name);
     }
 
-//    public static class TablePath {
-//        private final String catalog;
-//        private final String schema;
-//        private final String simpleName;
-//
-//        TablePath(String catalog, String schema, String simpleName) {
-//            this.catalog = (catalog);
-//            this.schema = (schema);
-//            this.simpleName = (simpleName);
-//        }
-//
-//
-//        public String getSimpleName() {
-//            return simpleName;
-//        }
-//
-//        public String getCatalog() {
-//            return catalog;
-//        }
-//
-//        public String getSchema() {
-//            return schema;
-//        }
-//    }
-//    private ArrayList<String> getPrimaryKeys(Connection conn, TablePath tablePath) throws SQLException {
-//        DatabaseMetaData md = conn.getMetaData();
-//        ResultSet rs = md.getPrimaryKeys(tablePath.getCatalog(), tablePath.getSchema(), tablePath.getSimpleName());
-//        ArrayList<String> keys = new ArrayList<>();
-//        int next_key_seq = 1;
-//        while (rs.next()) {
-//            String key = rs.getString("column_name");
-//            if (false) {
-//                // postgresql 에서만 동작.
-//                int seq = rs.getInt("key_seq");
-//                if (seq != next_key_seq) {
-//                    throw new RuntimeException("something wrong");
-//                }
-//                next_key_seq++;
-//            }
-//            keys.add(key);
-//        }
-//        return keys;
-//    }
-
     static class Helper implements QEntity<Helper> {
         static String getColumnName(Field f) {
             QColumn anno = f.getAnnotation(QColumn.class);
-            if (anno != null) return anno.value();
+            if (anno != null) return anno.name();
 
             PKColumn pk = f.getAnnotation(PKColumn.class);
             if (pk != null) return pk.value();

hyperquery/src/main/java/org/slowcoders/hyperquery/impl/SqlBuilder.java

@@ -326,7 +326,7 @@ public String buildUpdate(QUniqueRecord<?> entity) {
         sbQuery.incTab();
         for (ColumnMapping mapping : columnMappings) {
             if (mapping.columnName.equals("id")) continue;
-            String value = mapping.columnConfig.inputTransform().replaceAll("\\?", "_DATA." + mapping.columnName);
+            String value = mapping.columnConfig.writeTransform().replaceAll("\\?", "_DATA." + mapping.columnName);
             value = value.replaceAll("@", "t_0");
             sbQuery.write(mapping.columnName).write(" = ").write(value).write(",\n");
         }

hyperquery/src/main/java/org/slowcoders/hyperquery/impl/jdbc/JdbcColumn.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.databind.JsonNode;
+import org.slowcoders.hyperquery.util.CaseConverter;
 import org.slowcoders.hyperquery.util.ClassUtils;
 
 import java.lang.reflect.Field;
@@ -37,7 +38,7 @@ public class JdbcColumn { // extends QColumn {
     public JdbcColumn(ResultSetMetaData md, int col, /*ColumnBinder fkBinder,*/ String comment, List<String> primaryKeys) throws SQLException {
         this.physicalName = md.getColumnName(col);
         this.javaType = resolveJavaType(md, col);
-//        this.schema = schema;
+        this.fieldName = CaseConverter.toCamelCase(physicalName, false);
 
         this.isAutoIncrement = md.isAutoIncrement(col);
         this.isReadOnly = md.isReadOnly(col) | this.isAutoIncrement;
@@ -161,6 +162,10 @@ public final String getPhysicalName() {
         return physicalName;
     }
 
+    public final String getFieldName() {
+        return this.fieldName;
+    }
+
 //    public void setJoinedPrimaryColumn_unsafe(String jsonKey, String pk_table, String pk_column) {
 //        JdbcSchema schema1 = this.schema;
 //        if (this.fkBinder != null) {

sample-app/src/main/java/org/slowcoders/hyperql/sample/hq/bookstore/AuthorDto.java

@@ -11,22 +11,16 @@
 @Getter
 public class AuthorDto implements QRecord<Author> {
 
-    @QColumn("id")
     private Long id;
 
-    @QColumn("name")
     private String name;
 
-    @QColumn("@books")
     private List<Book> books;
 
-    @QColumn("bookCount")
     private int bookCount;
 
-    @QColumn("salesAmount")
     private int salesAmount;
 
-    @QColumn("bookPriceAvr")
     private int bookPriceAvr;
 
 //    @QColumn("attr2")

sample-app/src/main/java/org/slowcoders/hyperql/sample/hq/bookstore/BookDto.java

@@ -3,14 +3,12 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.slowcoders.hyperql.sample.hq.bookstore.api.HqBookController;
 import org.slowcoders.hyperql.sample.hq.bookstore.model.Book;
 import org.slowcoders.hyperquery.core.QColumn;
 import org.slowcoders.hyperquery.core.QFilter;
 import org.slowcoders.hyperquery.core.QRecord;
 
 import java.time.LocalDate;
-import java.util.List;
 
 @Getter
 @ToString
@@ -20,7 +18,7 @@ public class BookDto implements QRecord<Book> {
 
     private String title;
 
-    @QColumn("@author.name")
+    @QColumn(name = "@author.name")
     private String author;
 
 //    @QColumn("@weeklySales")

sample-app/src/main/java/org/slowcoders/hyperql/sample/hq/bookstore/api/SalesPricePercent.java

@@ -4,13 +4,13 @@
 import lombok.Setter;
 import org.slowcoders.hyperql.sample.hq.bookstore.model.Book;
 import org.slowcoders.hyperquery.core.QColumn;
-import org.slowcoders.hyperquery.core.QRecord;
 import org.slowcoders.hyperquery.core.QUniqueRecord;
 
 @Getter @Setter
 public class SalesPricePercent implements QUniqueRecord<Book> {
-    @QColumn("id")
+
     private int id;
-    @QColumn(value = "price", inputTransform = "@.price * ?")
+
+    @QColumn(name = "price", writeTransform = "@.price * ?")
     private double percent;
 }

sample-app/src/main/java/org/slowcoders/hyperql/sample/hq/bookstore/model/Author.java

@@ -11,17 +11,14 @@
 public class Author implements QEntity<Author> {
     @Getter
     @Setter
-    @QColumn("id")
     private Long id;
 
     @Getter
     @Setter
-    @QColumn("name")
     private String name;
 
     @Getter
     @Setter
-    @QColumn("profile")
     private com.fasterxml.jackson.databind.JsonNode profile;
 
     public static QJoin book_ = QJoin.of(Book.class, "#.author_id = @.id");

sample-app/src/main/java/org/slowcoders/hyperql/sample/hq/bookstore/model/Book.java

@@ -11,27 +11,22 @@
 public class Book implements QEntity<Book> {
     @Getter
     @Setter
-    @QColumn("id")
     private Long id;
 
     @Getter
     @Setter
-    @QColumn("price")
     private Float price;
 
     @Getter
     @Setter
-    @QColumn("title")
     private String title;
 
     @Getter
     @Setter
-    @QColumn("author_id")
     private Long authorId;
 
     @Getter
     @Setter
-    @QColumn("publisher_id")
     private Long publisherId;
 
     public static QJoin bookOrder_ = QJoin.of(BookOrder.class, "#.book_id = @.id");