Have database generation happen in its own method (cashapp#1699)

MariusVolkhart · May 31, 2020 · 39fbc6b · 39fbc6b
1 parent 6696c83
commit 39fbc6b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/sqldelight-compiler/src/main/kotlin/com/squareup/sqldelight/core/SqlDelightEnvironment.kt b/sqldelight-compiler/src/main/kotlin/com/squareup/sqldelight/core/SqlDelightEnvironment.kt
@@ -125,6 +125,7 @@ class SqlDelightEnvironment(
     }
 
     sourceFile?.let {
+      SqlDelightCompiler.writeDatabaseInterface(module, it, moduleName, writer)
       SqlDelightCompiler.writeImplementations(module, it, moduleName, writer)
     }
 

diff --git a/...ight-compiler/src/main/kotlin/com/squareup/sqldelight/core/compiler/SqlDelightCompiler.kt b/...ight-compiler/src/main/kotlin/com/squareup/sqldelight/core/compiler/SqlDelightCompiler.kt
@@ -42,6 +42,14 @@ object SqlDelightCompiler {
     writeViewInterfaces(module, file, implementationFolder, output)
     writeQueryInterfaces(module, file, implementationFolder, output)
     writeQueriesInterface(module, file, implementationFolder, output)
+  }
+
+  fun writeDatabaseInterface(
+    module: Module,
+    file: SqlDelightFile,
+    implementationFolder: String,
+    output: FileAppender
+  ) {
     writeQueryWrapperInterface(module, file, implementationFolder, output)
   }
 

diff --git a/...idea-plugin/src/test/kotlin/com/squareup/sqldelight/intellij/SqlDelightProjectTestCase.kt b/...idea-plugin/src/test/kotlin/com/squareup/sqldelight/intellij/SqlDelightProjectTestCase.kt
@@ -80,5 +80,6 @@ abstract class SqlDelightProjectTestCase : LightCodeInsightFixtureTestCase() {
       return@iterateContentUnderDirectory true
     }
     SqlDelightCompiler.writeInterfaces(module, fileToGenerateDb!!, module.name, virtualFileWriter)
+    SqlDelightCompiler.writeDatabaseInterface(module, fileToGenerateDb!!, module.name, virtualFileWriter)
   }
 }
diff --git a/test-util/src/main/kotlin/com/squareup/sqldelight/test/util/FixtureCompiler.kt b/test-util/src/main/kotlin/com/squareup/sqldelight/test/util/FixtureCompiler.kt
@@ -113,7 +113,10 @@ object FixtureCompiler {
       }
     }
 
-    if (generateDb) SqlDelightCompiler.writeImplementations(environment.module, file!!, "testmodule", fileWriter)
+    if (generateDb) {
+      SqlDelightCompiler.writeDatabaseInterface(environment.module, file!!, "testmodule", fileWriter)
+      SqlDelightCompiler.writeImplementations(environment.module, file!!, "testmodule", fileWriter)
+    }
 
     return CompilationResult(outputDirectory, compilerOutput, errors, sourceFiles.toString(), file!!)
   }