Getting number of rows inserted from Table.insert or Table.insertIgno…

…re? #851
JetBrains · Aug 4, 2021 · 6e170ca · 6e170ca
1 parent 530c893
commit 6e170ca
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/Transaction.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/Transaction.kt
@@ -148,7 +148,7 @@ open class Transaction(private val transactionImpl: TransactionInterface) : User
             }
         }
 
-        if (delta > warnLongQueriesDuration ?: Long.MAX_VALUE) {
+        if (delta > (warnLongQueriesDuration ?: Long.MAX_VALUE)) {
             exposedLogger.warn("Long query: ${describeStatement(delta, lazySQL.value)}", RuntimeException())
         }
 

diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/InsertStatement.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/InsertStatement.kt
@@ -7,8 +7,12 @@ import org.jetbrains.exposed.sql.vendors.currentDialect
 import org.jetbrains.exposed.sql.vendors.inProperCase
 import java.sql.ResultSet
 import java.sql.SQLException
+import kotlin.properties.Delegates
 
 open class InsertStatement<Key : Any>(val table: Table, val isIgnore: Boolean = false) : UpdateBuilder<Int>(StatementType.INSERT, listOf(table)) {
+
+    var insertedCount: Int by Delegates.notNull()
+
     var resultedValues: List<ResultRow>? = null
         private set
 
@@ -116,6 +120,7 @@ open class InsertStatement<Key : Any>(val table: Table, val isIgnore: Boolean =
     override fun PreparedStatementApi.executeInternal(transaction: Transaction): Int {
         val (inserted, rs) = execInsertFunction()
         return inserted.apply {
+            insertedCount = this
             resultedValues = processResults(rs, this)
         }
     }

diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/dml/InsertTests.kt b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/dml/InsertTests.kt
@@ -123,12 +123,22 @@ class InsertTests : DatabaseTestsBase() {
 
         val insertIgnoreSupportedDB = TestDB.values().toList() -
             listOf(TestDB.SQLITE, TestDB.MYSQL, TestDB.H2_MYSQL, TestDB.POSTGRESQL, TestDB.POSTGRESQLNG)
+
         withTables(insertIgnoreSupportedDB, idTable) {
-            val id = idTable.insertIgnore {
+            val insertedStatement = idTable.insertIgnore {
                 it[idTable.id] = EntityID(1, idTable)
                 it[idTable.name] = "1"
-            } get idTable.id
-            assertEquals(1, id.value)
+            }
+            assertEquals(1, insertedStatement[idTable.id].value)
+            assertEquals(1, insertedStatement.insertedCount)
+
+            val notInsertedStatement = idTable.insertIgnore {
+                it[idTable.id] = EntityID(1, idTable)
+                it[idTable.name] = "2"
+            }
+
+            assertEquals(1, notInsertedStatement[idTable.id].value)
+            assertEquals(0, notInsertedStatement.insertedCount)
         }
     }