...

Author: slowcoders

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

@@ -3,7 +3,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-public interface QEntity<T extends QEntity<T>> extends QRecord<T> {
+public interface QEntity<T extends QEntity<T>> extends QUniqueRecord<T> {
 
     @Retention(RetentionPolicy.RUNTIME)
     @interface TColumn {

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

@@ -0,0 +1,4 @@
+package org.slowcoders.hyperquery.core;
+
+public interface QUniqueRecord<T extends QUniqueRecord<T>> extends QRecord<T> {
+}

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

@@ -1,16 +1,34 @@
 package org.slowcoders.hyperquery.impl;
 
 
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.slowcoders.hyperquery.core.QEntity;
 import org.slowcoders.hyperquery.core.QFilter;
 import org.slowcoders.hyperquery.core.QRecord;
+import org.slowcoders.hyperquery.core.QUniqueRecord;
+
+import java.util.List;
 
 public interface QRepository {
 
     @Select("${__sql__}")
-    Object __select__(Object params);
+    Object __select__(@Param("_parameter") Object params, @Param("__sql__") Object __sql__);
+
+    @Update("""
+        WITH _DATA AS (
+            ${__input_data__}
+        ), _OLD AS (
+            SELECT * FROM ${__table_name__} AS _OLD
+            WHERE ${__filter__}
+        ), _NEW AS (
+            INSERT INTO ${__table_name__} (${__column_names__})
+            SELECT * FROM _DATA
+            RETURNING *
+        )
+    """)
+    Object __insert__(QEntity<?> entity);
 
     @Update("""
         WITH _DATA AS (
@@ -26,7 +44,23 @@ ON CONFLICT (${__primary_keys__})
             RETURNING *
         )
     """)
-    Object __insert_or_update__(QEntity entity);
+    Object __insert_or_update__(QEntity<?> entity);
+
+    @Update("""
+        WITH _DATA AS (
+            ${__input_data__}
+        ), _OLD AS (
+            SELECT * FROM ${__table_name__} AS OLD
+            WHERE ${__filter__}
+        ), _NEW AS (
+            UPDATE ${__table_name__} NEW
+            SET ${__assign_values__}
+            FROM _OLD
+            WHERE ${__new_pk_tuple__} IN (${__old_pk_tuple__})
+            RETURNING *
+        )
+    """)
+    QRecord<?> __updateAll__(QRecord<?> record, QFilter<?> filter);
 
     @Update("""
         WITH _DATA AS (
@@ -42,5 +76,6 @@ WITH _DATA AS (
             RETURNING *
         )
     """)
-    QRecord<?> __update__(QRecord<?> record, QFilter<?> filter);
+    QRecord<?> __update__(QUniqueRecord<?> record);
+
 }

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

@@ -183,7 +183,11 @@ public <R extends QRecord<E>> List<R> selectList(Class<R> resultType, QFilter<E>
 
         String id = registerMapper(null, relation, resultType);
 
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("_parameter", filter);
+        params.put("__sql__", "AAA " + sql);
         filter.setSql(sql);
+
         Object res = sqlSessionTemplate.selectList(id, filter);
         return (List) res;
     }

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

@@ -0,0 +1,4 @@
+package org.slowcoders.hyperquery.impl;
+
+public class SqlGenerator {
+}