mysql: check empty insert & update #457

Author: vincentlauvlwj

ktorm-core/src/main/kotlin/org/ktorm/dsl/Dml.kt

@@ -90,15 +90,17 @@ public fun <T : BaseTable<*>> Database.batchUpdate(
     block: BatchUpdateStatementBuilder<T>.() -> Unit
 ): IntArray {
     val builder = BatchUpdateStatementBuilder(table).apply(block)
-
-    val expressions = builder.expressions.map { expr ->
+    if (builder.expressions.isEmpty()) {
+        throw IllegalArgumentException("There are no items in the batch operation.")
+    }
+    for (expr in builder.expressions) {
         if (expr.assignments.isEmpty()) {
             throw IllegalArgumentException("There are no columns to update in the statement.")
-        } else {
-            dialect.createExpressionVisitor(AliasRemover).visit(expr)
         }
     }
 
+    val expressions = builder.expressions.map { dialect.createExpressionVisitor(AliasRemover).visit(it) }
+
     if (expressions.isEmpty()) {
         return IntArray(0)
     } else {
@@ -247,15 +249,17 @@ public fun <T : BaseTable<*>> Database.batchInsert(
     block: BatchInsertStatementBuilder<T>.() -> Unit
 ): IntArray {
     val builder = BatchInsertStatementBuilder(table).apply(block)
-
-    val expressions = builder.expressions.map { expr ->
+    if (builder.expressions.isEmpty()) {
+        throw IllegalArgumentException("There are no items in the batch operation.")
+    }
+    for (expr in builder.expressions) {
         if (expr.assignments.isEmpty()) {
             throw IllegalArgumentException("There are no columns to insert in the statement.")
-        } else {
-            dialect.createExpressionVisitor(AliasRemover).visit(expr)
         }
     }
 
+    val expressions = builder.expressions.map { dialect.createExpressionVisitor(AliasRemover).visit(it) }
+
     if (expressions.isEmpty()) {
         return IntArray(0)
     } else {

ktorm-support-mysql/src/main/kotlin/org/ktorm/support/mysql/BulkInsert.kt

@@ -92,6 +92,14 @@ public fun <T : BaseTable<*>> Database.bulkInsert(
     table: T, block: BulkInsertStatementBuilder<T>.() -> Unit
 ): Int {
     val builder = BulkInsertStatementBuilder(table).apply(block)
+    if (builder.assignments.isEmpty()) {
+        throw IllegalArgumentException("There are no items in the bulk operation.")
+    }
+    for (assignments in builder.assignments) {
+        if (assignments.isEmpty()) {
+            throw IllegalArgumentException("There are no columns to insert in the statement.")
+        }
+    }
 
     val expression = dialect.createExpressionVisitor(AliasRemover).visit(
         BulkInsertExpression(table.asExpression(), builder.assignments)
@@ -148,6 +156,14 @@ public fun <T : BaseTable<*>> Database.bulkInsertOrUpdate(
     table: T, block: BulkInsertOrUpdateStatementBuilder<T>.() -> Unit
 ): Int {
     val builder = BulkInsertOrUpdateStatementBuilder(table).apply(block)
+    if (builder.assignments.isEmpty()) {
+        throw IllegalArgumentException("There are no items in the bulk operation.")
+    }
+    for (assignments in builder.assignments) {
+        if (assignments.isEmpty()) {
+            throw IllegalArgumentException("There are no columns to insert in the statement.")
+        }
+    }
 
     val expression = dialect.createExpressionVisitor(AliasRemover).visit(
         BulkInsertExpression(table.asExpression(), builder.assignments, builder.updateAssignments)

ktorm-support-mysql/src/main/kotlin/org/ktorm/support/mysql/InsertOrUpdate.kt

@@ -77,6 +77,9 @@ public fun <T : BaseTable<*>> Database.insertOrUpdate(
     table: T, block: InsertOrUpdateStatementBuilder.(T) -> Unit
 ): Int {
     val builder = InsertOrUpdateStatementBuilder().apply { block(table) }
+    if (builder.assignments.isEmpty()) {
+        throw IllegalArgumentException("There are no columns to insert in the statement.")
+    }
 
     val expression = dialect.createExpressionVisitor(AliasRemover).visit(
         InsertOrUpdateExpression(table.asExpression(), builder.assignments, builder.updateAssignments)