Json Integration test

.gitignore

@@ -1,5 +1,8 @@
 .gradle
-/.idea
+**/.idea
+sqldelight-gradle-plugin/**/gradle
+sqldelight-gradle-plugin/**/gradlew
+sqldelight-gradle-plugin/**/gradlew.bat
 *.iml
 build
 local.properties

dialects/sqlite/json-module/src/main/kotlin/app/cash/sqldelight/dialects/sqlite/json/module/grammar/mixins/TableOrSubqueryMixin.kt

@@ -20,13 +20,15 @@ import com.intellij.psi.PsiElement
 internal abstract class TableOrSubqueryMixin(node: ASTNode?) : SqlTableOrSubqueryImpl(node), SqliteJsonTableOrSubquery {
   private val queryExposed = ModifiableFileLazy lazy@{
     if (jsonFunctionName != null) {
-      return@lazy listOf(QueryResult(
-        table = jsonFunctionName!!,
-        columns = emptyList(),
-        synthesizedColumns = listOf(
-          SynthesizedColumn(jsonFunctionName!!, acceptableValues = listOf("key", "value", "type", "atom", "id", "parent", "fullkey", "path", "json", "root"))
+      return@lazy listOf(
+        QueryResult(
+          table = jsonFunctionName!!,
+          columns = emptyList(),
+          synthesizedColumns = listOf(
+            SynthesizedColumn(jsonFunctionName!!, acceptableValues = listOf("key", "value", "type", "atom", "id", "parent", "fullkey", "path", "json", "root"))
+          )
         )
-      ))
+      )
     }
     super.queryExposed()
   }
@@ -42,9 +44,9 @@ internal abstract class TableOrSubqueryMixin(node: ASTNode?) : SqlTableOrSubquer
   }
 }
 
-internal abstract class JsonFunctionNameMixin(node: ASTNode): SqlNamedElementImpl(node), SqlTableName, ExposableType {
+internal abstract class JsonFunctionNameMixin(node: ASTNode) : SqlNamedElementImpl(node), SqlTableName, ExposableType {
   override fun getId(): PsiElement? = null
   override fun getString(): PsiElement? = null
   override val parseRule: (PsiBuilder, Int) -> Boolean = JsonParser::json_function_name_real
   override fun type() = IntermediateType(PrimitiveType.TEXT)
-}
+}

dialects/sqlite/json-module/src/test/kotlin/app/cash/sqldelight/dialects/sqlite/json/module/JsonModuleTest.kt

@@ -25,4 +25,4 @@ class JsonModuleTest(name: String, fixtureRoot: File) : FixturesTest(name, fixtu
         .map { arrayOf(it.name, it) }
     } + ansiFixtures
   }
-}
+}

sqldelight-compiler/dialect/src/main/kotlin/app/cash/sqldelight/dialect/api/ExposableType.kt

@@ -4,4 +4,4 @@ import com.alecstrong.sql.psi.core.psi.SqlAnnotatedElement
 
 interface ExposableType : SqlAnnotatedElement {
   fun type(): IntermediateType
-}
+}

sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/BindArgsTest.kt

@@ -1,6 +1,7 @@
 package app.cash.sqldelight.core
 
 import app.cash.sqldelight.core.lang.types.typeResolver
+import app.cash.sqldelight.core.lang.util.argumentType
 import app.cash.sqldelight.core.lang.util.findChildrenOfType
 import app.cash.sqldelight.core.lang.util.isArrayParameter
 import app.cash.sqldelight.dialect.api.PrimitiveType

sqldelight-gradle-plugin/src/test/integration-sqlite-json/build.gradle

@@ -0,0 +1,28 @@
+buildscript {
+  apply from: "${projectDir.absolutePath}/../buildscript.gradle"
+}
+
+apply plugin: 'org.jetbrains.kotlin.jvm'
+apply plugin: 'app.cash.sqldelight'
+
+repositories {
+  maven {
+    url "file://${projectDir.absolutePath}/../../../../build/localMaven"
+  }
+  mavenCentral()
+}
+
+sqldelight {
+  QueryWrapper {
+    packageName = "app.cash.sqldelight.integration"
+    dialect("app.cash.sqldelight:sqlite-3-18-dialect:${app.cash.sqldelight.VersionKt.VERSION}")
+    module("app.cash.sqldelight:sqlite-json-module:${app.cash.sqldelight.VersionKt.VERSION}")
+  }
+}
+
+dependencies {
+  implementation deps.sqliteJdbc
+  implementation "app.cash.sqldelight:sqlite-driver:${app.cash.sqldelight.VersionKt.VERSION}"
+  implementation deps.truth
+  implementation("com.squareup.moshi:moshi:1.13.0")
+}

sqldelight-gradle-plugin/src/test/integration-sqlite-json/settings.gradle

@@ -0,0 +1 @@
+apply from: "../settings.gradle"

sqldelight-gradle-plugin/src/test/integration-sqlite-json/src/main/sqldelight/app/cash/sqldelight/integration/JsonTable.sq

@@ -0,0 +1,21 @@
+CREATE TABLE user(
+  name TEXT NOT NULL PRIMARY KEY,
+  phone TEXT
+);
+
+insertUser:
+INSERT INTO user
+VALUES (?, ?);
+
+byAreaCode:
+SELECT DISTINCT user.name
+  FROM user, json_each(user.phone)
+ WHERE json_each.value LIKE :areaCode || '-%';
+
+byAreaCode2:
+SELECT name FROM user WHERE phone LIKE :areaCode || '-%'
+UNION
+SELECT user.name
+  FROM user, json_each(user.phone)
+ WHERE json_valid(user.phone)
+   AND json_each.value LIKE :areaCode || '-%';

sqldelight-gradle-plugin/src/test/integration-sqlite-json/src/test/java/app/cash/sqldelight/integration/IntegrationTests.kt

@@ -0,0 +1,53 @@
+package app.cash.sqldelight.integration
+
+import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
+import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver.Companion.IN_MEMORY
+import com.google.common.truth.Truth.assertThat
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import com.squareup.moshi.adapter
+import org.junit.Before
+import org.junit.Test
+
+class IntegrationTests {
+  private val moshi = Moshi.Builder().build()
+
+  private lateinit var queryWrapper: QueryWrapper
+  private lateinit var jsonQueries: JsonTableQueries
+
+  @Before fun before() {
+    val database = JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY)
+    QueryWrapper.Schema.create(database)
+
+    queryWrapper = QueryWrapper(database)
+    jsonQueries = queryWrapper.jsonTableQueries
+  }
+
+  @Test fun jsonArray() {
+    with(jsonQueries) {
+      insertUser("user1", jsonPhones("704-555-5555", "705-555-5555"))
+      insertUser("user2", jsonPhones("604-555-5555", "605-555-5555"))
+      assertThat(byAreaCode(areaCode = "704").executeAsList()).containsExactly(
+        "user1"
+      )
+    }
+  }
+
+  @Test fun jsonArrayOrLiteral() {
+    with(jsonQueries) {
+      insertUser("user1", jsonPhones("704-555-5555", "705-555-5555"))
+      insertUser("user2", jsonPhones("604-555-5555", "605-555-5555"))
+      insertUser("user3", "704-666-6666")
+      assertThat(byAreaCode2(areaCode = "704").executeAsList()).containsExactly(
+        "user1",
+        "user3"
+      )
+    }
+  }
+
+  private fun jsonPhones(vararg phoneNumbers: String): String {
+    val adapter =
+      moshi.adapter<List<String>>(Types.newParameterizedType(List::class.java, String::class.java))
+    return adapter.toJson(phoneNumbers.toList())
+  }
+}

sqldelight-gradle-plugin/src/test/kotlin/app/cash/sqldelight/integrations/IntegrationTest.kt

@@ -34,6 +34,15 @@ class IntegrationTest {
     assertThat(result.output).contains("BUILD SUCCESSFUL")
   }
 
+  @Test fun integrationTestsSqliteJsonModule() {
+    val runner = GradleRunner.create()
+      .withCommonConfiguration(File("src/test/integration-sqlite-json"))
+      .withArguments("clean", "check", "--stacktrace")
+
+    val result = runner.build()
+    assertThat(result.output).contains("BUILD SUCCESSFUL")
+  }
+
   @Test fun migrationCallbackIntegrationTests() {
     val runner = GradleRunner.create()
       .withCommonConfiguration(File("src/test/integration-migration-callbacks"))