SQLのログ出力処理の呼び出し

Author: mygreen

sqlmapper-parent/sqlmapper-core/src/main/java/com/github/mygreen/sqlmapper/core/query/InsertClause.java

@@ -37,15 +37,15 @@ public InsertClause(final int capacity) {
     }
 
     /**
-     * INTO句をSQLに変換します。
+     * INTO句({@literal  (col1, col2...)をSQLに変換します。
      * @return SQL
      */
     public String toIntoSql() {
         return intoSql.toString();
     }
 
     /**
-     * VALUES句をSQLに変換します。
+     * VALUES句({@literal  values (exp1, exp2, ...)}
      * @return SQL
      */
     public String toValuesSql() {

sqlmapper-parent/sqlmapper-core/src/main/java/com/github/mygreen/sqlmapper/core/query/auto/AutoAnyDeleteExecutor.java

@@ -108,6 +108,8 @@ private void prepareSql() {
      */
     public int execute() {
         prepare();
+        context.getSqlLogger().output(executedSql, paramValues);
+
         return getJdbcTemplate().update(executedSql, paramValues.toArray());
     }
 

sqlmapper-parent/sqlmapper-core/src/main/java/com/github/mygreen/sqlmapper/core/query/auto/AutoBatchDeleteExecutor.java

@@ -143,6 +143,7 @@ private boolean isOptimisticLock() {
     public int execute() {
 
         prepare();
+        context.getSqlLogger().output(executedSql, paramValues);
 
         final int rows = getJdbcTemplate().update(executedSql, paramValues.toArray());
         if(isOptimisticLock()) {

sqlmapper-parent/sqlmapper-core/src/main/java/com/github/mygreen/sqlmapper/core/query/auto/AutoBatchInsertExecutor.java

@@ -20,6 +20,7 @@
 import com.github.mygreen.sqlmapper.core.id.IdentityIdGenerator;
 import com.github.mygreen.sqlmapper.core.meta.PropertyMeta;
 import com.github.mygreen.sqlmapper.core.meta.PropertyValueInvoker;
+import com.github.mygreen.sqlmapper.core.query.InsertClause;
 import com.github.mygreen.sqlmapper.core.query.JdbcTemplateBuilder;
 import com.github.mygreen.sqlmapper.core.type.ValueType;
 import com.github.mygreen.sqlmapper.core.util.NumberConvertUtils;
@@ -51,6 +52,11 @@ public class AutoBatchInsertExecutor {
      */
     private final SqlMapperContext context;
 
+    /**
+     * INSERT句 - SQLログ出力のために使用する。
+     */
+    private InsertClause insertClause = new InsertClause();
+
     /**
      * クエリのパラメータ - エンティティごとの設定
      */
@@ -153,6 +159,10 @@ private void prepareSqlParam() {
             // IDENTITYの主キーでない場合は通常カラムとして追加
             if(!usingIdentityKeyColumnNames.contains(columnName)) {
                 usingColumnNames.add(columnName);
+
+                if(context.getSqlLogger().getProp().isEnabled()) {
+                    insertClause.addSql(columnName, "?");
+                }
             }
 
         }
@@ -247,6 +257,19 @@ public int[] execute() {
 
         prepare();
 
+        if(context.getSqlLogger().getProp().isEnabled()) {
+            String executedSql = "insert into "
+                    + query.getEntityMeta().getTableMeta().getFullName()
+                    + insertClause.toIntoSql()
+                    + insertClause.toValuesSql();
+
+            List<Object[]> batchArgs = new ArrayList<>(batchParams.length);
+            for(MapSqlParameterSource paramSource : batchParams) {
+                batchArgs.add(paramSource.getValues().values().toArray());
+            }
+            context.getSqlLogger().outputBatch(executedSql, batchArgs);
+        }
+
         if(this.usingIdentityKeyColumnNames.isEmpty()) {
             // 主キーがIDENTITYによる生成でない場合
             return insertOperation.executeBatch(batchParams);

sqlmapper-parent/sqlmapper-core/src/main/java/com/github/mygreen/sqlmapper/core/query/auto/AutoBatchUpdateExecutor.java

@@ -235,7 +235,10 @@ public int[] execute() {
             return new int[query.getEntitySize()];
         }
 
-        int[] res = getJdbcTemplate().batchUpdate(executedSql, QueryUtils.convertBatchArgs(batchParams));
+        final List<Object[]> batchArgs = QueryUtils.convertBatchArgs(batchParams);
+        context.getSqlLogger().outputBatch(executedSql, batchArgs);
+
+        int[] res = getJdbcTemplate().batchUpdate(executedSql, batchArgs);
 
         final int dataSize = query.getEntitySize();
         for(int i=0; i < dataSize; i++) {

sqlmapper-parent/sqlmapper-core/src/main/java/com/github/mygreen/sqlmapper/core/query/auto/AutoDeleteExecutor.java

@@ -133,6 +133,7 @@ private boolean isOptimisticLock() {
     public int execute() {
 
         prepare();
+        context.getSqlLogger().output(executedSql, paramValues);
 
         final int rows = getJdbcTemplate().update(executedSql, paramValues.toArray());
         if(isOptimisticLock()) {

sqlmapper-parent/sqlmapper-core/src/main/java/com/github/mygreen/sqlmapper/core/query/auto/AutoInsertExecutor.java

@@ -19,6 +19,7 @@
 import com.github.mygreen.sqlmapper.core.id.IdentityIdGenerator;
 import com.github.mygreen.sqlmapper.core.meta.PropertyMeta;
 import com.github.mygreen.sqlmapper.core.meta.PropertyValueInvoker;
+import com.github.mygreen.sqlmapper.core.query.InsertClause;
 import com.github.mygreen.sqlmapper.core.query.JdbcTemplateBuilder;
 import com.github.mygreen.sqlmapper.core.type.ValueType;
 import com.github.mygreen.sqlmapper.core.util.NumberConvertUtils;
@@ -50,6 +51,11 @@ public class AutoInsertExecutor {
      */
     private final SqlMapperContext context;
 
+    /**
+     * INSERT句 - SQLログ出力のために使用する。
+     */
+    private InsertClause insertClause = new InsertClause();
+
     /**
      * クエリのパラメータです。
      */
@@ -127,6 +133,10 @@ private void prepareSqlParam() {
             // IDENTITYの主キーでない場合は通常カラムとして追加
             if(!usingIdentityKeyColumnNames.contains(columnName)) {
                 usingColumnNames.add(columnName);
+
+                if(context.getSqlLogger().getProp().isEnabled()) {
+                    insertClause.addSql(columnName, "?");
+                }
             }
 
             // クエリのパラメータの組み立て
@@ -225,6 +235,15 @@ private JdbcTemplate getJdbcTemplate() {
     public int execute() {
         prepare();
 
+        if(context.getSqlLogger().getProp().isEnabled()) {
+            String executedSql = "insert into "
+                    + query.getEntityMeta().getTableMeta().getFullName()
+                    + insertClause.toIntoSql()
+                    + insertClause.toValuesSql();
+
+            context.getSqlLogger().output(executedSql, paramSource.getValues().values());
+        }
+
         if(this.usingIdentityKeyColumnNames.isEmpty()) {
             // 主キーがIDENTITYによる生成しない場合
             return insertOperation.execute(paramSource);