Skip to content

Commit 971f2fc

Browse files
committed
Add DslMarker to control receiver scoping
1 parent bfbc7ce commit 971f2fc

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/CriteriaCollector.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import org.mybatis.dynamic.sql.VisitableCondition
2121

2222
typealias CriteriaReceiver = CriteriaCollector.() -> CriteriaCollector
2323

24+
@MyBatisDslMarker
2425
class CriteriaCollector {
2526
val criteria = mutableListOf<SqlCriterion<*>>()
2627

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/JoinCollector.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import org.mybatis.dynamic.sql.select.join.JoinCriterion
2121

2222
typealias JoinReceiver = JoinCollector.() -> JoinCollector
2323

24+
@MyBatisDslMarker
2425
class JoinCollector {
2526
val onJoinCriterion: JoinCriterion by lazy { internalOnCriterion }
2627
val andJoinCriteria = mutableListOf<JoinCriterion>()

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinBaseBuilders.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ import org.mybatis.dynamic.sql.select.AbstractQueryExpressionDSL
2222
import org.mybatis.dynamic.sql.select.SelectModel
2323
import org.mybatis.dynamic.sql.where.AbstractWhereDSL
2424

25+
@DslMarker annotation class MyBatisDslMarker
26+
27+
@MyBatisDslMarker
2528
abstract class KotlinBaseBuilder<W : AbstractWhereDSL<W>, B : KotlinBaseBuilder<W, B>> {
2629
fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>): B =
2730
applySelf {

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUnionBuilders.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import org.mybatis.dynamic.sql.SqlTable
2020
import org.mybatis.dynamic.sql.select.QueryExpressionDSL
2121
import org.mybatis.dynamic.sql.select.SelectModel
2222

23+
@MyBatisDslMarker
2324
class KotlinUnionBuilder(private val unionBuilder: QueryExpressionDSL<SelectModel>.UnionBuilder) {
2425
fun select(vararg selectList: BasicColumn) =
2526
select(selectList.toList())

0 commit comments

Comments
 (0)