Skip to content

Commit f20632c

Browse files
authored
Enable removal of blank lines from SQL templates (#1135)
* Add SqlBuilderSettings to control sql building * Add BlankNode * Rename * Remove duplicated code * Polish * Fix missing delegation * Add test code * Add test code * Improve test code
1 parent 89870bf commit f20632c

File tree

15 files changed

+2100
-32
lines changed

15 files changed

+2100
-32
lines changed

build.gradle.kts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree.Companion.test
2+
13
plugins {
24
`java-library`
35
`maven-publish`
@@ -15,6 +17,7 @@ val Project.javaModuleName: String
1517

1618
val modularProjects: List<Project> = subprojects.filter { it.name.startsWith("doma-") }
1719
val integrationTestProjects: List<Project> = subprojects.filter { it.name.startsWith("integration-test-") }
20+
val unitTestProjects: List<Project> = subprojects.filter { it.name.startsWith("unit-test") }
1821

1922
val encoding: String by project
2023
val isReleaseVersion = !version.toString().endsWith("SNAPSHOT")
@@ -334,6 +337,17 @@ configure(integrationTestProjects) {
334337
}
335338
}
336339

340+
configure(unitTestProjects) {
341+
apply(plugin = "java")
342+
apply(plugin = "com.diffplug.spotless")
343+
344+
tasks {
345+
test {
346+
useJUnitPlatform()
347+
}
348+
}
349+
}
350+
337351
rootProject.apply {
338352
release {
339353
newVersionCommitMessage.set("[Gradle Release Plugin] - [skip ci] new version commit: ")

doma-core/src/main/java/org/seasar/doma/internal/RuntimeConfig.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.seasar.doma.jdbc.QueryImplementors;
1616
import org.seasar.doma.jdbc.RequiresNewController;
1717
import org.seasar.doma.jdbc.ScriptFileLoader;
18+
import org.seasar.doma.jdbc.SqlBuilderSettings;
1819
import org.seasar.doma.jdbc.SqlFileRepository;
1920
import org.seasar.doma.jdbc.SqlLogType;
2021
import org.seasar.doma.jdbc.UnknownColumnHandler;
@@ -146,4 +147,13 @@ public EntityListenerProvider getEntityListenerProvider() {
146147
}
147148
return provider;
148149
}
150+
151+
@Override
152+
public SqlBuilderSettings getSqlBuilderSettings() {
153+
SqlBuilderSettings settings = config.getSqlBuilderSettings();
154+
if (settings == null) {
155+
throw new ConfigException(config.getClass().getName(), "getSqlBuilderSettings");
156+
}
157+
return settings;
158+
}
149159
}

0 commit comments

Comments
 (0)