Hardcoded database implementation package name

sqldelight-compiler/integration-tests/src/test/kotlin/com/example/TestDatabase.kt

@@ -4,8 +4,8 @@ import app.cash.sqldelight.Transacter
 import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlSchema
-import com.example.testmodule.newInstance
-import com.example.testmodule.schema
+import com.example.`impl`.newInstance
+import com.example.`impl`.schema
 import kotlin.Unit
 
 public interface TestDatabase : Transacter {

sqldelight-compiler/integration-tests/src/test/kotlin/com/example/testmodule/TestDatabaseImpl.kt → sqldelight-compiler/integration-tests/src/test/kotlin/com/example/impl/TestDatabaseImpl.kt

@@ -1,4 +1,4 @@
-package com.example.testmodule
+package com.example.`impl`
 
 import app.cash.sqldelight.TransacterImpl
 import app.cash.sqldelight.db.AfterVersion

sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/compiler/SqlDelightCompiler.kt

@@ -66,20 +66,18 @@ object SqlDelightCompiler {
   fun writeDatabaseInterface(
     module: Module,
     file: SqlDelightFile,
-    implementationFolder: String,
     output: FileAppender,
   ) {
-    writeQueryWrapperInterface(module, file, implementationFolder, output)
+    writeQueryWrapperInterface(module, file, output)
   }
 
   fun writeImplementations(
     module: Module,
     sourceFile: SqlDelightFile,
-    implementationFolder: String,
     output: FileAppender,
   ) {
     val fileIndex = SqlDelightFileIndex.getInstance(module)
-    val packageName = "${fileIndex.packageName}.$implementationFolder"
+    val packageName = "${fileIndex.packageName}.impl"
     val databaseImplementationType = DatabaseGenerator(module, sourceFile).type()
     val exposer = DatabaseExposerGenerator(databaseImplementationType, fileIndex, sourceFile.generateAsync)
 
@@ -98,15 +96,14 @@ object SqlDelightCompiler {
   private fun writeQueryWrapperInterface(
     module: Module,
     sourceFile: SqlDelightFile,
-    implementationFolder: String,
     output: FileAppender,
   ) {
     val fileIndex = SqlDelightFileIndex.getInstance(module)
     val packageName = fileIndex.packageName
     val queryWrapperType = DatabaseGenerator(module, sourceFile).interfaceType()
     val fileSpec = FileSpec.builder(packageName, queryWrapperType.name!!)
       // TODO: Remove these when kotlinpoet supports top level types.
-      .addImport("$packageName.$implementationFolder", "newInstance", "schema")
+      .addImport("$packageName.impl", "newInstance", "schema")
       .apply {
         var index = 0
         fileIndex.dependencies.forEach {

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

@@ -47,11 +47,11 @@ class QueriesTypeTest {
     val insert = result.compiledFile.namedMutators.first()
     assertThat(result.errors).isEmpty()
 
-    val database = File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")
+    val database = File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")
     assertThat(result.compilerOutput).containsKey(database)
     assertThat(result.compilerOutput[database].toString()).isEqualTo(
       """
-      |package com.example.testmodule
+      |package com.example.`impl`
       |
       |import app.cash.sqldelight.TransacterImpl
       |import app.cash.sqldelight.db.AfterVersion
@@ -237,11 +237,11 @@ class QueriesTypeTest {
     val insert = result.compiledFile.namedMutators.first()
     assertThat(result.errors).isEmpty()
 
-    val database = File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")
+    val database = File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")
     assertThat(result.compilerOutput).containsKey(database)
     assertThat(result.compilerOutput[database].toString()).isEqualTo(
       """
-      |package com.example.testmodule
+      |package com.example.`impl`
       |
       |import app.cash.sqldelight.TransacterImpl
       |import app.cash.sqldelight.db.AfterVersion
@@ -338,11 +338,11 @@ class QueriesTypeTest {
       fileName = "Data.sq",
     )
 
-    val database = File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")
+    val database = File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")
     assertThat(result.compilerOutput).containsKey(database)
     assertThat(result.compilerOutput[database].toString()).isEqualTo(
       """
-      |package com.example.testmodule
+      |package com.example.`impl`
       |
       |import app.cash.sqldelight.TransacterImpl
       |import app.cash.sqldelight.db.AfterVersion
@@ -415,11 +415,11 @@ class QueriesTypeTest {
     val insert = result.compiledFile.namedMutators.first()
     assertThat(result.errors).isEmpty()
 
-    val database = File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")
+    val database = File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")
     assertThat(result.compilerOutput).containsKey(database)
     assertThat(result.compilerOutput[database].toString()).isEqualTo(
       """
-      |package com.example.testmodule
+      |package com.example.`impl`
       |
       |import app.cash.sqldelight.TransacterImpl
       |import app.cash.sqldelight.db.AfterVersion
@@ -573,11 +573,11 @@ class QueriesTypeTest {
     val insert = result.compiledFile.namedMutators.first()
     assertThat(result.errors).isEmpty()
 
-    val database = File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")
+    val database = File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")
     assertThat(result.compilerOutput).containsKey(database)
     assertThat(result.compilerOutput[database].toString()).isEqualTo(
       """
-      |package com.example.testmodule
+      |package com.example.`impl`
       |
       |import app.cash.sqldelight.TransacterImpl
       |import app.cash.sqldelight.db.AfterVersion

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

@@ -29,11 +29,11 @@ class QueryWrapperTest {
 
     assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
     assertThat(queryWrapperFile).isNotNull()
     assertThat(queryWrapperFile.toString()).isEqualTo(
       """
-      |package com.example.testmodule
+      |package com.example.`impl`
       |
       |import app.cash.sqldelight.TransacterImpl
       |import app.cash.sqldelight.db.AfterVersion
@@ -109,11 +109,11 @@ class QueryWrapperTest {
 
     assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
     assertThat(queryWrapperFile).isNotNull()
     assertThat(queryWrapperFile.toString()).isEqualTo(
       """
-        |package com.example.testmodule
+        |package com.example.`impl`
         |
         |import app.cash.sqldelight.TransacterImpl
         |import app.cash.sqldelight.db.AfterVersion
@@ -194,12 +194,12 @@ class QueryWrapperTest {
 
     assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
 
     assertThat(queryWrapperFile).isNotNull()
     assertThat(queryWrapperFile.toString()).isEqualTo(
       """
-        |package com.example.testmodule
+        |package com.example.`impl`
         |
         |import app.cash.sqldelight.TransacterImpl
         |import app.cash.sqldelight.db.AfterVersion
@@ -289,11 +289,11 @@ class QueryWrapperTest {
 
     assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
     assertThat(queryWrapperFile).isNotNull()
     assertThat(queryWrapperFile.toString()).isEqualTo(
       """
-        |package com.example.testmodule
+        |package com.example.`impl`
         |
         |import app.cash.sqldelight.TransacterImpl
         |import app.cash.sqldelight.db.AfterVersion
@@ -375,11 +375,11 @@ class QueryWrapperTest {
 
     assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
     assertThat(queryWrapperFile).isNotNull()
     assertThat(queryWrapperFile.toString()).isEqualTo(
       """
-        |package com.example.testmodule
+        |package com.example.`impl`
         |
         |import app.cash.sqldelight.TransacterImpl
         |import app.cash.sqldelight.db.AfterVersion
@@ -459,11 +459,11 @@ class QueryWrapperTest {
 
     assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
     assertThat(queryWrapperFile).isNotNull()
     assertThat(queryWrapperFile.toString()).isEqualTo(
       """
-        |package com.example.testmodule
+        |package com.example.`impl`
         |
         |import app.cash.sqldelight.TransacterImpl
         |import app.cash.sqldelight.db.AfterVersion
@@ -534,11 +534,11 @@ class QueryWrapperTest {
 
     assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
     assertThat(queryWrapperFile).isNotNull()
     assertThat(queryWrapperFile.toString()).isEqualTo(
       """
-        |package com.example.testmodule
+        |package com.example.`impl`
         |
         |import app.cash.sqldelight.TransacterImpl
         |import app.cash.sqldelight.db.AfterVersion
@@ -630,11 +630,11 @@ class QueryWrapperTest {
 
     assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
     assertThat(queryWrapperFile).isNotNull()
     assertThat(queryWrapperFile.toString()).isEqualTo(
       """
-        |package com.example.testmodule
+        |package com.example.`impl`
         |
         |import app.cash.sqldelight.TransacterImpl
         |import app.cash.sqldelight.db.AfterVersion
@@ -745,11 +745,11 @@ class QueryWrapperTest {
 
     assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
     assertThat(queryWrapperFile).isNotNull()
     assertThat(queryWrapperFile.toString()).isEqualTo(
       """
-        |package com.example.testmodule
+        |package com.example.`impl`
         |
         |import app.cash.sqldelight.TransacterImpl
         |import app.cash.sqldelight.db.AfterVersion
@@ -858,11 +858,11 @@ class QueryWrapperTest {
 
     assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
     assertThat(queryWrapperFile.toString()).apply {
       startsWith(
         """
-        |package com.example.testmodule
+        |package com.example.`impl`
         |
         |import app.cash.sqldelight.TransacterImpl
         |import app.cash.sqldelight.db.AfterVersion

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

@@ -48,11 +48,11 @@ class AsyncQueriesTypeTest {
     val insert = result.compiledFile.namedMutators.first()
     Truth.assertThat(result.errors).isEmpty()
 
-    val database = File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")
+    val database = File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")
     Truth.assertThat(result.compilerOutput).containsKey(database)
     Truth.assertThat(result.compilerOutput[database].toString()).isEqualTo(
       """
-      |package com.example.testmodule
+      |package com.example.`impl`
       |
       |import app.cash.sqldelight.SuspendingTransacterImpl
       |import app.cash.sqldelight.db.AfterVersion

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

@@ -49,11 +49,11 @@ class AsyncQueryWrapperTest {
 
     Truth.assertThat(result.errors).isEmpty()
 
-    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/testmodule/TestDatabaseImpl.kt")]
+    val queryWrapperFile = result.compilerOutput[File(result.outputDirectory, "com/example/impl/TestDatabaseImpl.kt")]
     Truth.assertThat(queryWrapperFile).isNotNull()
     Truth.assertThat(queryWrapperFile.toString()).isEqualTo(
       """
-        |package com.example.testmodule
+        |package com.example.`impl`
         |
         |import app.cash.sqldelight.SuspendingTransacterImpl
         |import app.cash.sqldelight.db.AfterVersion

sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/core/SqlDelightEnvironment.kt

@@ -63,7 +63,6 @@ class SqlDelightEnvironment(
   private val compilationUnit: SqlDelightCompilationUnit,
   private val verifyMigrations: Boolean,
   override var dialect: SqlDelightDialect,
-  moduleName: String,
   private val sourceFolders: List<File> = compilationUnit.sourceFolders
     .filter { it.folder.exists() && !it.dependency }
     .map { it.folder },
@@ -74,7 +73,6 @@ class SqlDelightEnvironment(
   SqlDelightProjectService {
   val project = projectEnvironment.project
   val module = MockModule(project, projectEnvironment.parentDisposable)
-  private val moduleName = SqlDelightFileIndex.sanitizeDirectoryName(moduleName)
 
   init {
     project.registerService(SqlDelightProjectService::class.java, this)
@@ -176,15 +174,15 @@ class SqlDelightEnvironment(
           output = writer,
           includeAll = true,
         )
-        SqlDelightCompiler.writeImplementations(module, migrationFile, moduleName, writer)
+        SqlDelightCompiler.writeImplementations(module, migrationFile, writer)
       }
       logger("----- END ${migrationFile.name} in $timeTaken ms ------")
     }
 
     sourceFile?.let {
-      SqlDelightCompiler.writeDatabaseInterface(module, it, moduleName, writer)
+      SqlDelightCompiler.writeDatabaseInterface(module, it, writer)
       if (it is SqlDelightQueriesFile) {
-        SqlDelightCompiler.writeImplementations(module, it, moduleName, writer)
+        SqlDelightCompiler.writeImplementations(module, it, writer)
       }
     }
 

sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/GenerateMigrationOutputTask.kt

@@ -71,13 +71,12 @@ abstract class GenerateMigrationOutputTask : SqlDelightWorkerTask() {
     override fun execute() {
       val properties = parameters.properties.get()
       val environment = SqlDelightEnvironment(
-        sourceFolders = sourceFolders.filter { it.exists() },
-        dependencyFolders = emptyList(),
-        moduleName = parameters.moduleName.get(),
         properties = properties,
-        verifyMigrations = false,
         compilationUnit = parameters.compilationUnit.get(),
+        verifyMigrations = false,
         dialect = ServiceLoader.load(SqlDelightDialect::class.java).first(),
+        sourceFolders = sourceFolders.filter { it.exists() },
+        dependencyFolders = emptyList(),
       )
 
       val outputDirectory = parameters.outputDirectory.get().asFile

sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/GenerateSchemaTask.kt

@@ -74,13 +74,12 @@ abstract class GenerateSchemaTask : SqlDelightWorkerTask() {
 
     override fun execute() {
       val environment = SqlDelightEnvironment(
-        sourceFolders = sourceFolders.filter { it.exists() },
-        dependencyFolders = emptyList(),
-        moduleName = parameters.moduleName.get(),
         properties = parameters.properties.get(),
-        verifyMigrations = parameters.verifyMigrations.get(),
         compilationUnit = parameters.compilationUnit.get(),
+        verifyMigrations = parameters.verifyMigrations.get(),
         dialect = ServiceLoader.load(SqlDelightDialect::class.java).first(),
+        sourceFolders = sourceFolders.filter { it.exists() },
+        dependencyFolders = emptyList(),
       )
 
       var maxVersion = 1L

sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/SqlDelightTask.kt

@@ -88,9 +88,8 @@ abstract class SqlDelightTask : SqlDelightWorkerTask() {
     override fun execute() {
       parameters.outputDirectory.get().asFile.deleteRecursively()
       val environment = SqlDelightEnvironment(
-        compilationUnit = parameters.compilationUnit.get(),
         properties = parameters.properties.get(),
-        moduleName = parameters.projectName.get(),
+        compilationUnit = parameters.compilationUnit.get(),
         verifyMigrations = parameters.verifyMigrations.get(),
         dialect = ServiceLoader.load(SqlDelightDialect::class.java).first(),
       )

sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/VerifyMigrationTask.kt

@@ -100,13 +100,12 @@ abstract class VerifyMigrationTask : SqlDelightWorkerTask() {
 
     private val environment by lazy {
       SqlDelightEnvironment(
-        sourceFolders = sourceFolders.filter { it.exists() },
-        dependencyFolders = emptyList(),
-        moduleName = parameters.projectName.get(),
         properties = parameters.properties.get(),
-        verifyMigrations = parameters.verifyMigrations.get(),
         compilationUnit = parameters.compilationUnit.get(),
+        verifyMigrations = parameters.verifyMigrations.get(),
         dialect = ServiceLoader.load(SqlDelightDialect::class.java).first(),
+        sourceFolders = sourceFolders.filter { it.exists() },
+        dependencyFolders = emptyList(),
       )
     }