Allow JSON binary operator to be used on a column expression (#4776)

sqldelight · Apr 2, 2024 · dea4fc1 · dea4fc1
1 parent 33e4eda
commit dea4fc1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/...ain/kotlin/app/cash/sqldelight/dialects/sqlite_3_38/grammar/mixins/JsonExpressionMixin.kt b/...ain/kotlin/app/cash/sqldelight/dialects/sqlite_3_38/grammar/mixins/JsonExpressionMixin.kt
@@ -3,15 +3,15 @@ package app.cash.sqldelight.dialects.sqlite_3_38.grammar.mixins
 import app.cash.sqldelight.dialects.sqlite_3_38.grammar.psi.SqliteJsonExpression
 import com.alecstrong.sql.psi.core.SqlAnnotationHolder
 import com.alecstrong.sql.psi.core.psi.SqlColumnDef
-import com.alecstrong.sql.psi.core.psi.SqlColumnName
+import com.alecstrong.sql.psi.core.psi.SqlColumnExpr
 import com.alecstrong.sql.psi.core.psi.SqlCompositeElementImpl
 import com.intellij.lang.ASTNode
 
 internal abstract class JsonExpressionMixin(node: ASTNode) :
   SqlCompositeElementImpl(node),
   SqliteJsonExpression {
   override fun annotate(annotationHolder: SqlAnnotationHolder) {
-    val columnType = ((firstChild.reference?.resolve() as? SqlColumnName)?.parent as? SqlColumnDef)?.columnType?.typeName?.text
+    val columnType = ((firstChild as? SqlColumnExpr)?.columnName?.reference?.resolve()?.parent as? SqlColumnDef)?.columnType?.typeName?.text
     if (columnType == null || columnType != "TEXT") {
       annotationHolder.createErrorAnnotation(firstChild, "Left side of json expression must be a text column.")
     }

diff --git a/...s/sqlite-3-38/src/main/kotlin/app/cash/sqldelight/dialects/sqlite_3_38/grammar/sqlite.bnf b/...s/sqlite-3-38/src/main/kotlin/app/cash/sqldelight/dialects/sqlite_3_38/grammar/sqlite.bnf
@@ -17,7 +17,7 @@ extension_expr ::= json_expression {
   override = true
 }
 
-json_expression ::= {column_name} json_binary_operator <<expr '-1'>> {
+json_expression ::= {column_expr} json_binary_operator <<expr '-1'>> {
   mixin = "app.cash.sqldelight.dialects.sqlite_3_38.grammar.mixins.JsonExpressionMixin"
   pin = 2
 }

diff --git a/dialects/sqlite-3-38/src/test/fixtures_sqlite_3_38/json_functions/Test.s b/dialects/sqlite-3-38/src/test/fixtures_sqlite_3_38/json_functions/Test.s
@@ -1,5 +1,6 @@
 CREATE TABLE myTable(
     data TEXT NOT NULL,
+    otherData TEXT,
     number INTEGER NOT NULL
 );
 
@@ -13,3 +14,15 @@ WHERE
 --error[col 2]: Left side of json expression must be a text column.
   number ->> 'sup'
 ;
+
+UPDATE myTable
+SET otherData = subquery.data -> 'sup'
+FROM (SELECT number, data FROM myTable) subquery
+WHERE subquery.number = myTable.number;
+
+UPDATE myTable
+SET data = data -> newData
+FROM(
+  SELECT 'sup' AS newData
+)
+WHERE data = '';