kotlin-orm · vincentlauvlwj · Sep 11, 2021 · Sep 10, 2021 · Sep 10, 2021 · Sep 10, 2021
diff --git a/ktorm-core/src/main/kotlin/org/ktorm/dsl/Query.kt b/ktorm-core/src/main/kotlin/org/ktorm/dsl/Query.kt
@@ -221,12 +221,18 @@ public inline fun Query.where(condition: () -> ColumnDeclaring<Boolean>): Query
  * Note that if we don't add any conditions to the list, the `where` clause would not be set.
  */
 public inline fun Query.whereWithConditions(block: (MutableList<ColumnDeclaring<Boolean>>) -> Unit): Query {
-    val conditions = ArrayList<ColumnDeclaring<Boolean>>().apply(block)
+    var conditions: List<ColumnDeclaring<Boolean>> = ArrayList<ColumnDeclaring<Boolean>>().apply(block)
 
     if (conditions.isEmpty()) {
         return this
     } else {
-        return this.where { conditions.reduce { a, b -> a and b } }
+        while (conditions.size > 1) {
+            conditions = conditions.chunked(2) { chunk ->
+                if (chunk.size == 2) chunk[0] and chunk[1] else chunk[0]
+            }
+        }
+
+        return this.where { conditions[0] }
     }
 }
 
@@ -237,12 +243,18 @@ public inline fun Query.whereWithConditions(block: (MutableList<ColumnDeclaring<
  * Note that if we don't add any conditions to the list, the `where` clause would not be set.
  */
 public inline fun Query.whereWithOrConditions(block: (MutableList<ColumnDeclaring<Boolean>>) -> Unit): Query {
-    val conditions = ArrayList<ColumnDeclaring<Boolean>>().apply(block)
+    var conditions: List<ColumnDeclaring<Boolean>> = ArrayList<ColumnDeclaring<Boolean>>().apply(block)
 
     if (conditions.isEmpty()) {
         return this
     } else {
-        return this.where { conditions.reduce { a, b -> a or b } }
+        while (conditions.size > 1) {
+            conditions = conditions.chunked(2) { chunk ->
+                if (chunk.size == 2) chunk[0] or chunk[1] else chunk[0]
+            }
+        }
+
+        return this.where { conditions[0] }
     }
 }
 

diff --git a/ktorm-core/src/test/kotlin/org/ktorm/dsl/QueryTest.kt b/ktorm-core/src/test/kotlin/org/ktorm/dsl/QueryTest.kt
@@ -11,6 +11,7 @@ import java.util.concurrent.ExecutionException
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
+import kotlin.random.Random
 
 /**
  * Created by vince on Dec 07, 2018.
@@ -69,6 +70,24 @@ class QueryTest : BaseTest() {
         assert(name == "vince")
     }
 
+    @Test
+    fun testWhereWithOrConditionsNoStackOverflow() {
+        val t = Employees.aliased("t")
+
+        val sql = database
+            .from(t)
+            .select(t.name)
+            .whereWithOrConditions { where ->
+                repeat(100_000) {
+                    where += (t.id eq Random.nextInt()) and (t.departmentId eq Random.nextInt())
+                }
+            }
+            .sql
+
+        // very large SQL doesn't cause stackoverflow
+        assert(true)
+    }
+
     @Test
     fun testCombineConditions() {
         val t = Employees.aliased("t")
@@ -300,4 +319,4 @@ class QueryTest : BaseTest() {
         assert(names[0] == "0:vince")
         assert(names[1] == "1:marry")
     }
-}
+}