SqlBinaryExpr changes

griffio · griffio · commit 120ba4fbfa70 · 2023-09-10T18:38:34.000+01:00
Use SqlCastExpr tyoe or use SqlColumExpr to get column type

Add Tests for Bind argument when used with CAST and Binary Expression
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
@@ -25,12 +25,16 @@ import app.cash.sqldelight.dialect.api.PrimitiveType.NULL
 import app.cash.sqldelight.dialect.api.PrimitiveType.TEXT
 import app.cash.sqldelight.dialect.api.SelectQueryable
 import com.alecstrong.sql.psi.core.psi.SqlBetweenExpr
+import com.alecstrong.sql.psi.core.psi.SqlBinaryBooleanExpr
+import com.alecstrong.sql.psi.core.psi.SqlBinaryEqualityExpr
 import com.alecstrong.sql.psi.core.psi.SqlBinaryExpr
 import com.alecstrong.sql.psi.core.psi.SqlBinaryLikeExpr
+import com.alecstrong.sql.psi.core.psi.SqlBinaryPipeExpr
 import com.alecstrong.sql.psi.core.psi.SqlBindExpr
 import com.alecstrong.sql.psi.core.psi.SqlCaseExpr
 import com.alecstrong.sql.psi.core.psi.SqlCastExpr
 import com.alecstrong.sql.psi.core.psi.SqlCollateExpr
+import com.alecstrong.sql.psi.core.psi.SqlColumnExpr
 import com.alecstrong.sql.psi.core.psi.SqlCompoundSelectStmt
 import com.alecstrong.sql.psi.core.psi.SqlExpr
 import com.alecstrong.sql.psi.core.psi.SqlFunctionExpr
@@ -114,11 +118,21 @@ internal fun SqlExpr.argumentType(argument: SqlExpr): IntermediateType {
         IntermediateType(PrimitiveType.BOOLEAN)
       }
     }
-    is SqlBetweenExpr, is SqlIsExpr, is SqlBinaryExpr -> {
+
+    is SqlBinaryPipeExpr, is SqlBinaryEqualityExpr, is SqlIsExpr, is SqlBinaryBooleanExpr, is SqlBetweenExpr -> {
       val validArg = children.lastOrNull { it is SqlExpr && it !== argument && it !is SqlBindExpr }
       validArg?.type() ?: children.last { it is SqlExpr && it !== argument }.type()
     }
 
+    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 }
+      }
+      validArg?.type() ?: children.last { it is SqlExpr && it !== argument }.type()
+    }
+
     is SqlNullExpr -> IntermediateType(NULL).asNullable()
     is SqlBinaryLikeExpr -> {
       val other = children.last { it is SqlExpr && it !== argument }.type()
diff --git a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/BindArgsTest.kt b/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/BindArgsTest.kt
@@ -1,5 +1,6 @@
 package app.cash.sqldelight.core
 
+import app.cash.sqldelight.core.lang.argumentType
 import app.cash.sqldelight.core.lang.types.typeResolver
 import app.cash.sqldelight.core.lang.util.argumentType
 import app.cash.sqldelight.core.lang.util.findChildrenOfType
@@ -386,5 +387,57 @@ class BindArgsTest {
     }
   }
 
+  @Test fun `bind arg type in binary expression can be inferred from column`() {
+    val file = FixtureCompiler.parseSql(
+      """
+        |CREATE TABLE data (
+        |  datum INTEGER NOT NULL
+        |);
+        |
+        |selectData:
+        |SELECT *
+        |FROM data
+        |WHERE datum > :datum1 - 2.5 AND datum < :datum2 + 2.5;
+      """.trimMargin(),
+      tempFolder,
+    )
+    val column = file.namedQueries.first()
+    column.parameters.let { args ->
+      assertThat(args[0].dialectType).isEqualTo(PrimitiveType.INTEGER)
+      assertThat(args[0].javaType).isEqualTo(Long::class.asClassName())
+      assertThat(args[0].name).isEqualTo("datum1")
+
+      assertThat(args[1].dialectType).isEqualTo(PrimitiveType.INTEGER)
+      assertThat(args[1].javaType).isEqualTo(Long::class.asClassName())
+      assertThat(args[1].name).isEqualTo("datum2")
+    }
+  }
+
+  @Test fun `bind arg in binary expression can be cast as type`() {
+    val file = FixtureCompiler.parseSql(
+      """
+        |CREATE TABLE data (
+        |  datum INTEGER NOT NULL
+        |);
+        |
+        |selectData:
+        |SELECT CAST(:datum1 AS REAL) + CAST(:datum2 AS INTEGER) - 10.5
+        |FROM data;
+      """.trimMargin(),
+      tempFolder,
+    )
+
+    val column = file.namedQueries.first()
+    column.parameters.let { args ->
+      assertThat(args[0].dialectType).isEqualTo(PrimitiveType.REAL)
+      assertThat(args[0].javaType).isEqualTo(Double::class.asClassName().copy(nullable = true))
+      assertThat(args[0].name).isEqualTo("datum1")
+
+      assertThat(args[1].dialectType).isEqualTo(PrimitiveType.INTEGER)
+      assertThat(args[1].javaType).isEqualTo(Long::class.asClassName().copy(nullable = true))
+      assertThat(args[1].name).isEqualTo("datum2")
+    }
+  }
+
   private fun SqlBindExpr.argumentType() = typeResolver.argumentType(this)
 }
