diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml deleted file mode 100644 index 69734e5..0000000 --- a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml deleted file mode 100644 index 69734e5..0000000 --- a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml new file mode 100644 index 0000000..80cfa8b --- /dev/null +++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml deleted file mode 100644 index 69734e5..0000000 --- a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml new file mode 100644 index 0000000..80cfa8b --- /dev/null +++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index b1f3a90..ca55a0f 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -17,7 +17,7 @@ - + diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml deleted file mode 100644 index 69734e5..0000000 --- a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml new file mode 100644 index 0000000..80cfa8b --- /dev/null +++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index b1f3a90..ca55a0f 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -17,7 +17,7 @@ - + diff --git a/build.gradle b/build.gradle index 12f5197..d7aa1d3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus' -version '1.5.9-SNAPSHOT' +version '1.5.9' apply plugin: 'java' apply plugin: 'idea' diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml deleted file mode 100644 index 69734e5..0000000 --- a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml new file mode 100644 index 0000000..80cfa8b --- /dev/null +++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index b1f3a90..ca55a0f 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -17,7 +17,7 @@ - + diff --git a/build.gradle b/build.gradle index 12f5197..d7aa1d3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus' -version '1.5.9-SNAPSHOT' +version '1.5.9' apply plugin: 'java' apply plugin: 'idea' diff --git a/src/nl/astraeus/jdbc/PreparedStatementLogger.java b/src/nl/astraeus/jdbc/PreparedStatementLogger.java index 29fa6de..b7fd226 100644 --- a/src/nl/astraeus/jdbc/PreparedStatementLogger.java +++ b/src/nl/astraeus/jdbc/PreparedStatementLogger.java @@ -543,15 +543,23 @@ } public void addBatch(String sql) throws SQLException { + this.sql += "\n"+sql; statement.addBatch(sql); } public void clearBatch() throws SQLException { + this.sql += ""; statement.clearBatch(); } public int[] executeBatch() throws SQLException { - return statement.executeBatch(); + clearTime(); + + int [] result = statement.executeBatch(); + + log(QueryType.BATCH, sql); + + return result; } public Connection getConnection() throws SQLException { diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml deleted file mode 100644 index 69734e5..0000000 --- a/.idea/libraries/Gradle__com_h2database_h2_1_4_194.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml new file mode 100644 index 0000000..80cfa8b --- /dev/null +++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_196.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index b1f3a90..ca55a0f 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -17,7 +17,7 @@ - + diff --git a/build.gradle b/build.gradle index 12f5197..d7aa1d3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus' -version '1.5.9-SNAPSHOT' +version '1.5.9' apply plugin: 'java' apply plugin: 'idea' diff --git a/src/nl/astraeus/jdbc/PreparedStatementLogger.java b/src/nl/astraeus/jdbc/PreparedStatementLogger.java index 29fa6de..b7fd226 100644 --- a/src/nl/astraeus/jdbc/PreparedStatementLogger.java +++ b/src/nl/astraeus/jdbc/PreparedStatementLogger.java @@ -543,15 +543,23 @@ } public void addBatch(String sql) throws SQLException { + this.sql += "\n"+sql; statement.addBatch(sql); } public void clearBatch() throws SQLException { + this.sql += ""; statement.clearBatch(); } public int[] executeBatch() throws SQLException { - return statement.executeBatch(); + clearTime(); + + int [] result = statement.executeBatch(); + + log(QueryType.BATCH, sql); + + return result; } public Connection getConnection() throws SQLException { diff --git a/src/nl/astraeus/jdbc/StatementLogger.java b/src/nl/astraeus/jdbc/StatementLogger.java index 4579a8f..389d2a9 100644 --- a/src/nl/astraeus/jdbc/StatementLogger.java +++ b/src/nl/astraeus/jdbc/StatementLogger.java @@ -178,7 +178,7 @@ int [] result = statement.executeBatch(); - log(QueryType.STATEMENT, sql); + log(QueryType.BATCH, sql); return result; }