Rearrange logic

to streamline checks for CAST,
sqldelight · Sep 18, 2023 · 715a959 · 715a959
1 parent d5884ee
commit 715a959
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/lang/util/Arguments.kt b/sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/lang/util/Arguments.kt
@@ -125,11 +125,14 @@ internal fun SqlExpr.argumentType(argument: SqlExpr): IntermediateType {
     }
 
     is SqlBinaryExpr -> {
-      val validArg = children.lastOrNull { it is SqlCastExpr && it == argument } ?: if (children.none() { it is SqlColumnExpr }) {
-        parent.children.lastOrNull { it is SqlExpr && it !== argument && it !is SqlBinaryExpr }
-      } else {
-        children.lastOrNull { it is SqlExpr && it !== argument && it !is SqlBindExpr }
+      val validArg = children.lastOrNull {
+        it is SqlCastExpr && it == argument
+      } ?: children.lastOrNull {
+        it is SqlColumnExpr
+      } ?: parent.children.lastOrNull {
+        it is SqlExpr && it !== argument && it !is SqlBinaryExpr
       }
+
       validArg?.type() ?: children.last { it is SqlExpr && it !== argument }.type()
     }