From 76d6eff28053fda792efcb11a3bbeaa72d40a70f Mon Sep 17 00:00:00 2001 From: Omico Date: Sat, 20 Apr 2024 18:18:21 -0700 Subject: [PATCH] Hardcoded database implementation package name --- .../test/kotlin/com/example/TestDatabase.kt | 4 +- .../{testmodule => impl}/TestDatabaseImpl.kt | 2 +- .../core/compiler/SqlDelightCompiler.kt | 9 ++--- .../cash/sqldelight/core/QueriesTypeTest.kt | 20 +++++----- .../cash/sqldelight/core/QueryWrapperTest.kt | 40 +++++++++---------- .../core/async/AsyncQueriesTypeTest.kt | 4 +- .../core/async/AsyncQueryWrapperTest.kt | 4 +- .../sqldelight/core/SqlDelightEnvironment.kt | 8 ++-- .../gradle/GenerateMigrationOutputTask.kt | 7 ++-- .../sqldelight/gradle/GenerateSchemaTask.kt | 7 ++-- .../cash/sqldelight/gradle/SqlDelightTask.kt | 3 +- .../sqldelight/gradle/VerifyMigrationTask.kt | 7 ++-- .../gradle/squash/MigrationSquashTask.kt | 7 ++-- .../sqldelight/intellij/ProjectService.kt | 2 +- .../intellij/SqlDelightProjectTestCase.kt | 2 +- .../sqldelight/test/util/FixtureCompiler.kt | 9 +---- .../sqldelight/test/util/TestEnvironment.kt | 2 - 17 files changed, 60 insertions(+), 77 deletions(-) rename sqldelight-compiler/integration-tests/src/test/kotlin/com/example/{testmodule => impl}/TestDatabaseImpl.kt (98%) diff --git a/sqldelight-compiler/integration-tests/src/test/kotlin/com/example/TestDatabase.kt b/sqldelight-compiler/integration-tests/src/test/kotlin/com/example/TestDatabase.kt index 1ea311c23eb..6c598ca6a6e 100644 --- a/sqldelight-compiler/integration-tests/src/test/kotlin/com/example/TestDatabase.kt +++ b/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 { diff --git a/sqldelight-compiler/integration-tests/src/test/kotlin/com/example/testmodule/TestDatabaseImpl.kt b/sqldelight-compiler/integration-tests/src/test/kotlin/com/example/impl/TestDatabaseImpl.kt similarity index 98% rename from sqldelight-compiler/integration-tests/src/test/kotlin/com/example/testmodule/TestDatabaseImpl.kt rename to sqldelight-compiler/integration-tests/src/test/kotlin/com/example/impl/TestDatabaseImpl.kt index a535ba98c7e..6b863560ca6 100644 --- a/sqldelight-compiler/integration-tests/src/test/kotlin/com/example/testmodule/TestDatabaseImpl.kt +++ b/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 diff --git a/sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/compiler/SqlDelightCompiler.kt b/sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/compiler/SqlDelightCompiler.kt index c9d6151e7a6..0ab4a5ace53 100644 --- a/sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/compiler/SqlDelightCompiler.kt +++ b/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,7 +96,6 @@ object SqlDelightCompiler { private fun writeQueryWrapperInterface( module: Module, sourceFile: SqlDelightFile, - implementationFolder: String, output: FileAppender, ) { val fileIndex = SqlDelightFileIndex.getInstance(module) @@ -106,7 +103,7 @@ object SqlDelightCompiler { 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 { diff --git a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/QueriesTypeTest.kt b/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/QueriesTypeTest.kt index 4802248de22..088c17d5168 100644 --- a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/QueriesTypeTest.kt +++ b/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 diff --git a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/QueryWrapperTest.kt b/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/QueryWrapperTest.kt index 1a06f3d93d6..8b8ef75ea46 100644 --- a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/QueryWrapperTest.kt +++ b/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 diff --git a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/async/AsyncQueriesTypeTest.kt b/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/async/AsyncQueriesTypeTest.kt index 705a9d8e2ec..cf59c460404 100644 --- a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/async/AsyncQueriesTypeTest.kt +++ b/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 diff --git a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/async/AsyncQueryWrapperTest.kt b/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/async/AsyncQueryWrapperTest.kt index eaeb30bc187..d73eaddd320 100644 --- a/sqldelight-compiler/src/test/kotlin/app/cash/sqldelight/core/async/AsyncQueryWrapperTest.kt +++ b/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 diff --git a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/core/SqlDelightEnvironment.kt b/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/core/SqlDelightEnvironment.kt index 5759ae874b5..ac6c80c783f 100644 --- a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/core/SqlDelightEnvironment.kt +++ b/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 = 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) } } diff --git a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/GenerateMigrationOutputTask.kt b/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/GenerateMigrationOutputTask.kt index 402384262b6..5e1b4fa75fb 100644 --- a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/GenerateMigrationOutputTask.kt +++ b/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 diff --git a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/GenerateSchemaTask.kt b/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/GenerateSchemaTask.kt index 672ed970ba1..64b08ea4df0 100644 --- a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/GenerateSchemaTask.kt +++ b/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 diff --git a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/SqlDelightTask.kt b/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/SqlDelightTask.kt index 5cfdc73a3f3..0c4410f4e0e 100644 --- a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/SqlDelightTask.kt +++ b/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(), ) diff --git a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/VerifyMigrationTask.kt b/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/VerifyMigrationTask.kt index 9eefac7c6c3..a5ac55d6caf 100644 --- a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/VerifyMigrationTask.kt +++ b/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(), ) } diff --git a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/squash/MigrationSquashTask.kt b/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/squash/MigrationSquashTask.kt index 3fdd5671839..a3993ef44c7 100644 --- a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/squash/MigrationSquashTask.kt +++ b/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/squash/MigrationSquashTask.kt @@ -64,13 +64,12 @@ abstract class MigrationSquashTask : 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 fileFromText = { text: String -> diff --git a/sqldelight-idea-plugin/src/main/kotlin/app/cash/sqldelight/intellij/ProjectService.kt b/sqldelight-idea-plugin/src/main/kotlin/app/cash/sqldelight/intellij/ProjectService.kt index 5bc1d668c59..3c5beef95fe 100644 --- a/sqldelight-idea-plugin/src/main/kotlin/app/cash/sqldelight/intellij/ProjectService.kt +++ b/sqldelight-idea-plugin/src/main/kotlin/app/cash/sqldelight/intellij/ProjectService.kt @@ -147,7 +147,7 @@ class ProjectService(val project: Project) : SqlDelightProjectService, Disposabl invokeLater { runWriteAction { try { - SqlDelightCompiler.writeDatabaseInterface(module, file, module.name, fileAppender) + SqlDelightCompiler.writeDatabaseInterface(module, file, fileAppender) } catch (e: InvalidElementDetectedException) { // Since this is an IDE step, it's possible it happens during some element invalidation. // In those cases its okay to ignore this time and wait until the next attempt at diff --git a/sqldelight-idea-plugin/src/test/kotlin/app/cash/sqldelight/intellij/SqlDelightProjectTestCase.kt b/sqldelight-idea-plugin/src/test/kotlin/app/cash/sqldelight/intellij/SqlDelightProjectTestCase.kt index 087fd4ccc9f..75a440d7639 100644 --- a/sqldelight-idea-plugin/src/test/kotlin/app/cash/sqldelight/intellij/SqlDelightProjectTestCase.kt +++ b/sqldelight-idea-plugin/src/test/kotlin/app/cash/sqldelight/intellij/SqlDelightProjectTestCase.kt @@ -121,6 +121,6 @@ abstract class SqlDelightProjectTestCase : LightJavaCodeInsightFixtureTestCase() } val dialect = SqliteDialect() SqlDelightCompiler.writeInterfaces(module, dialect, fileToGenerateDb!!, virtualFileWriter) - SqlDelightCompiler.writeDatabaseInterface(module, fileToGenerateDb!!, module.name, virtualFileWriter) + SqlDelightCompiler.writeDatabaseInterface(module, fileToGenerateDb!!, virtualFileWriter) } } diff --git a/test-util/src/main/kotlin/app/cash/sqldelight/test/util/FixtureCompiler.kt b/test-util/src/main/kotlin/app/cash/sqldelight/test/util/FixtureCompiler.kt index f5dde517ddb..c076cd44481 100644 --- a/test-util/src/main/kotlin/app/cash/sqldelight/test/util/FixtureCompiler.kt +++ b/test-util/src/main/kotlin/app/cash/sqldelight/test/util/FixtureCompiler.kt @@ -144,13 +144,8 @@ object FixtureCompiler { } if (generateDb) { - SqlDelightCompiler.writeDatabaseInterface(environment.module, file!!, "testmodule", fileWriter) - SqlDelightCompiler.writeImplementations( - environment.module, - file!!, - "testmodule", - fileWriter, - ) + SqlDelightCompiler.writeDatabaseInterface(environment.module, file!!, fileWriter) + SqlDelightCompiler.writeImplementations(environment.module, file!!, fileWriter) } return CompilationResult(outputDirectory, compilerOutput, errors, sourceFiles.toString(), file!!) diff --git a/test-util/src/main/kotlin/app/cash/sqldelight/test/util/TestEnvironment.kt b/test-util/src/main/kotlin/app/cash/sqldelight/test/util/TestEnvironment.kt index 810965a391e..a3b469a3438 100644 --- a/test-util/src/main/kotlin/app/cash/sqldelight/test/util/TestEnvironment.kt +++ b/test-util/src/main/kotlin/app/cash/sqldelight/test/util/TestEnvironment.kt @@ -45,8 +45,6 @@ internal class TestEnvironment( }, dialect = dialect, verifyMigrations = true, - // hyphen in the name tests that our module name sanitizing works correctly - moduleName = "test-module", compilationUnit = compilationUnit, ) LanguageParserDefinitions.INSTANCE.forLanguage(SqlDelightLanguage).createParser(environment.project)