refines sql updateCascadedEntities

Author: slowcoders

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

@@ -451,7 +451,6 @@ public <E extends QEntity<E>> String buildUpdateCascaded2(Object baseId, QJoin j
         if (subEntities.isEmpty()) {
             sbQuery.write("select * from ").write(rootSchema.getTableName()).write(" where false");
         } else {
-            sbQuery.incTab();
             sbQuery.write("select ");
             sbQuery.incTab();
             for (ColumnMapping mapping : columnMappings) {
@@ -473,7 +472,6 @@ public <E extends QEntity<E>> String buildUpdateCascaded2(Object baseId, QJoin j
             sbQuery.decTab();
         }
         sbQuery.decTab();
-        sbQuery.decTab();
         sbQuery.write("\n), _UPSERT as (\n");
         sbQuery.incTab();
         sbQuery.write("INSERT INTO ").write(rootSchema.getTableName()).write(" (\n");
@@ -496,7 +494,9 @@ public <E extends QEntity<E>> String buildUpdateCascaded2(Object baseId, QJoin j
             sbQuery.write(col).write(", ");
         }
         sbQuery.shrinkLength(2);
+        sbQuery.incTab();
         sbQuery.replaceTrailingComma(")\nDO UPDATE SET\n");
+        sbQuery.incTab();
         for (ColumnMapping mapping : columnMappings) {
             if (mapping.columnName.equals("id")) continue;
             String value = mapping.columnConfig == null ? "EXCLUDED." + mapping.columnName :
@@ -507,28 +507,34 @@ public <E extends QEntity<E>> String buildUpdateCascaded2(Object baseId, QJoin j
         sbQuery.shrinkLength(2);
         sbQuery.decTab();
         sbQuery.decTab();
-        sbQuery.write("\n)\nDELETE FROM hql_demo.bookstore.book_order t_0\n");
+        sbQuery.write("\nRETURNING *");
+        sbQuery.decTab();
+        sbQuery.write("\n), _DELETE as (");
         sbQuery.incTab();
-        sbQuery.write("WHERE NOT EXISTS (\n");
+        sbQuery.write("\nDELETE FROM hql_demo.bookstore.book_order t_0");
+        sbQuery.write("\nWHERE ");
+        String joinOn = join.getJoinCriteria();
+        joinOn = joinOn.replaceAll("#", "t_0");
+        joinOn = joinOn.replaceAll("@\\.(\\w+)", "#{parent.$1}");
+        sbQuery.write(joinOn);
+
+        sbQuery.incTab();
+        sbQuery.write("\nAND NOT EXISTS (\n");
         sbQuery.incTab();
         sbQuery.write("SELECT 1\n");
-        sbQuery.write("FROM _DATA\n");
+        sbQuery.write("FROM _UPSERT\n");
         sbQuery.write("WHERE ");
         sbQuery.incTab();
         for (String col : rootSchema.getPrimaryKeys()) {
-            sbQuery.write("t_0.").write(col).write(" = _DATA.").write(col).write("\n AND ");
+            sbQuery.write("t_0.").write(col).write(" = _UPSERT.").write(col).write("\n AND ");
         }
         sbQuery.decTab();
-        sbQuery.shrinkLength(5);
+        sbQuery.shrinkLength(6).trim();
         sbQuery.decTab().write("\n)");
-        String joinOn = join.getJoinCriteria();
-        joinOn = joinOn.replaceAll("#", "t_0");
-        joinOn = joinOn.replaceAll("@\\.(\\w+)", "#{parent.$1}");
-        sbQuery.write("AND ").write(joinOn);
-
         sbQuery.decTab();
-        sbQuery.write(";\nselect * from ").write(rootSchema.getTableName());
-        sbQuery.write("\nwhere ").write(joinOn);
+        sbQuery.decTab();
+        sbQuery.write("\n)");
+        sbQuery.write("\nselect * from _UPSERT");
         return sbQuery.toString();
     }
 

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

@@ -176,7 +176,7 @@ private JdbcColumn getColumnByPhysicalName(ArrayList<JdbcColumn> columns, String
     public ArrayList<JdbcColumn> getColumns(Connection conn, Map<String, String> comments, TablePath tablePath, List<String> primaryKeys) throws SQLException {
         //HashMap<String, JqlIndex> indexes = getUniqueConstraints(conn, dbSchema, tableName);
         ArrayList<JdbcColumn> columns = new ArrayList<>();
-        String sql = "select * from " + tablePath.getQualifiedName() + " " +" limit 1";
+        String sql = "select * from " + tablePath.getQualifiedName() + " where false";
         ResultSet rs = conn.createStatement().executeQuery(sql);
         ResultSetMetaData md = rs.getMetaData();
         int cntColumn = md.getColumnCount();

hyperquery/src/main/java/org/slowcoders/hyperquery/util/SourceWriter.java

@@ -158,6 +158,16 @@ public Self shrinkLength(int len) {
         return (Self)this;
     }
 
+    public Self trim() {
+        int len = sb.length();
+        for (; len > 0; len --) {
+            char ch = sb.charAt(len - 1);
+            if (ch > ' ') break;
+        }
+        sb.setLength(len);
+        return (Self)this;
+    }
+
     public String reset() {
         String s = sb.toString();
         sb.setLength(0);

sample-app/src/main/resources/logback-spring.xml

@@ -61,12 +61,12 @@
     </logger>
 
     <!-- SQL문만을 로그로 남기며, PreparedStatement일 경우 관련된 argument 값으로 대체된 SQL문 출력 -->
-    <logger name="jdbc.sqlonly" level="DEBUG" additivity="false">
+    <logger name="jdbc.sqlonly" level="INFO" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>
 
     <!-- SQL문과 해당 SQL을 실행시키는데 수행된 시간 정보(milliseconds)를 포함하여 출력. -->
-    <logger name="jdbc.sqltiming" level="INFO" additivity="false">
+    <logger name="jdbc.sqltiming" level="OFF" additivity="false">
         <appender-ref ref="STDOUT" />
     </logger>