Skip to content

Commit abd9ba5

Browse files
jeffgbutlerjeffgbutler
committed
Rewrite all the tests and examples to use the new where DSL
1 parent daeaa18 commit abd9ba5

File tree

14 files changed

+393
-1342
lines changed

14 files changed

+393
-1342
lines changed

‎src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapperExtensions.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import org.mybatis.dynamic.sql.util.kotlin.InsertSelectCompleter
3131
import org.mybatis.dynamic.sql.util.kotlin.KotlinUpdateBuilder
3232
import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
3333
import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
34-
import org.mybatis.dynamic.sql.util.kotlin.elements.isEqualTo
3534
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.count
3635
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.countDistinct
3736
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.countFrom
@@ -60,7 +59,7 @@ fun PersonMapper.delete(completer: DeleteCompleter) =
6059

6160
fun PersonMapper.deleteByPrimaryKey(id_: Int) =
6261
delete {
63-
where(id, isEqualTo(id_))
62+
where { id isEqualTo id_ }
6463
}
6564

6665
fun PersonMapper.insert(record: PersonRecord) =
@@ -132,7 +131,7 @@ fun PersonMapper.selectDistinct(completer: SelectCompleter) =
132131

133132
fun PersonMapper.selectByPrimaryKey(id_: Int) =
134133
selectOne {
135-
where(id, isEqualTo(id_))
134+
where { id isEqualTo id_ }
136135
}
137136

138137
fun PersonMapper.update(completer: UpdateCompleter) =
@@ -168,7 +167,7 @@ fun PersonMapper.updateByPrimaryKey(record: PersonRecord) =
168167
set(employed).equalToOrNull(record::employed)
169168
set(occupation).equalToOrNull(record::occupation)
170169
set(addressId).equalToOrNull(record::addressId)
171-
where(id, isEqualTo(record.id!!))
170+
where { id isEqualTo record.id!! }
172171
}
173172

174173
fun PersonMapper.updateByPrimaryKeySelective(record: PersonRecord) =
@@ -179,5 +178,5 @@ fun PersonMapper.updateByPrimaryKeySelective(record: PersonRecord) =
179178
set(employed).equalToWhenPresent(record::employed)
180179
set(occupation).equalToWhenPresent(record::occupation)
181180
set(addressId).equalToWhenPresent(record::addressId)
182-
where(id, isEqualTo(record.id!!))
181+
where { id isEqualTo record.id!! }
183182
}

‎src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapperTest.kt‎

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,7 @@ import org.assertj.core.api.Assertions.assertThat
3636
import org.junit.jupiter.api.Test
3737
import org.mybatis.dynamic.sql.util.kotlin.elements.add
3838
import org.mybatis.dynamic.sql.util.kotlin.elements.constant
39-
import org.mybatis.dynamic.sql.util.kotlin.elements.isEqualTo
40-
import org.mybatis.dynamic.sql.util.kotlin.elements.isFalse
41-
import org.mybatis.dynamic.sql.util.kotlin.elements.isGreaterThan
4239
import org.mybatis.dynamic.sql.util.kotlin.elements.isIn
43-
import org.mybatis.dynamic.sql.util.kotlin.elements.isLessThan
44-
import org.mybatis.dynamic.sql.util.kotlin.elements.isLike
45-
import org.mybatis.dynamic.sql.util.kotlin.elements.isNotLike
46-
import org.mybatis.dynamic.sql.util.kotlin.elements.isNull
47-
import org.mybatis.dynamic.sql.util.kotlin.elements.isTrue
4840
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.insertInto
4941
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.select
5042
import java.io.InputStreamReader
@@ -77,8 +69,8 @@ class PersonMapperTest {
7769
val mapper = session.getMapper(PersonMapper::class.java)
7870

7971
val rows = mapper.select {
80-
where(id, isEqualTo(1))
81-
or(occupation, isNull())
72+
where { id isEqualTo 1 }
73+
or { occupation.isNull() }
8274
}
8375

8476
assertThat(rows).hasSize(3)
@@ -120,8 +112,8 @@ class PersonMapperTest {
120112
val mapper = session.getMapper(PersonMapper::class.java)
121113

122114
val rows = mapper.selectDistinct {
123-
where(id, isGreaterThan(1))
124-
or(occupation, isNull())
115+
where { id isGreaterThan 1 }
116+
or { occupation.isNull() }
125117
}
126118

127119
assertThat(rows).hasSize(5)
@@ -134,7 +126,7 @@ class PersonMapperTest {
134126
val mapper = session.getMapper(PersonMapper::class.java)
135127

136128
val rows = mapper.select {
137-
where(employed, isEqualTo(false))
129+
where { employed isEqualTo false }
138130
orderBy(id)
139131
}
140132

@@ -160,7 +152,7 @@ class PersonMapperTest {
160152
val mapper = session.getMapper(PersonMapper::class.java)
161153

162154
val rows = mapper.select {
163-
where(firstName, isIn("Fred", "Barney"))
155+
where { firstName.isIn("Fred", "Barney") }
164156
}
165157

166158
assertThat(rows).hasSize(2)
@@ -190,7 +182,7 @@ class PersonMapperTest {
190182
val mapper = session.getMapper(PersonMapper::class.java)
191183

192184
val rows = mapper.delete {
193-
where(occupation, isNull())
185+
where { occupation.isNull() }
194186
}
195187
assertThat(rows).isEqualTo(2)
196188
}
@@ -319,7 +311,7 @@ class PersonMapperTest {
319311

320312
rows = mapper.update {
321313
set(occupation).equalTo("Programmer")
322-
where(id, isEqualTo(100))
314+
where { id isEqualTo 100 }
323315
}
324316
assertThat(rows).isEqualTo(1)
325317

@@ -340,7 +332,7 @@ class PersonMapperTest {
340332

341333
rows = mapper.update {
342334
set(occupation).equalTo("Programmer")
343-
where(id, isEqualTo(100))
335+
where { id isEqualTo 100 }
344336
}
345337
assertThat(rows).isEqualTo(1)
346338

@@ -362,8 +354,8 @@ class PersonMapperTest {
362354

363355
rows = mapper.update {
364356
set(occupation).equalTo("Programmer")
365-
where(id, isEqualTo(100))
366-
and(firstName, isEqualTo("Joe"))
357+
where { id isEqualTo 100 }
358+
and { firstName isEqualTo "Joe" }
367359
}
368360

369361
assertThat(rows).isEqualTo(1)
@@ -385,7 +377,7 @@ class PersonMapperTest {
385377

386378
rows = mapper.update {
387379
set(occupation).equalTo("Programmer")
388-
where(id, isEqualTo(100))
380+
where { id isEqualTo 100 }
389381
}
390382

391383
assertThat(rows).isEqualTo(1)
@@ -449,7 +441,7 @@ class PersonMapperTest {
449441

450442
rows = mapper.update {
451443
set(occupation).equalTo("Programmer")
452-
where(id, isEqualTo(100))
444+
where { id isEqualTo 100 }
453445
}
454446

455447
assertThat(rows).isEqualTo(1)
@@ -465,8 +457,9 @@ class PersonMapperTest {
465457
val mapper = session.getMapper(PersonMapper::class.java)
466458

467459
val rows = mapper.count {
468-
where(occupation, isNull()) {
469-
and(employed, isFalse())
460+
where {
461+
occupation.isNull()
462+
and { employed.isFalse() }
470463
}
471464
}
472465

@@ -480,8 +473,8 @@ class PersonMapperTest {
480473
val mapper = session.getMapper(PersonMapper::class.java)
481474

482475
val rows = mapper.count {
483-
where(employed, isTrue())
484-
and(occupation, isEqualTo("Brontosaurus Operator"))
476+
where { employed.isTrue() }
477+
and { occupation isEqualTo "Brontosaurus Operator" }
485478
}
486479

487480
assertThat(rows).isEqualTo(2L)
@@ -494,8 +487,10 @@ class PersonMapperTest {
494487
val mapper = session.getMapper(PersonMapper::class.java)
495488

496489
val rows = mapper.count {
497-
where(id, isEqualTo(1))
498-
or(id, isEqualTo(2))
490+
where {
491+
id isEqualTo 1
492+
or { id isEqualTo 2 }
493+
}
499494
}
500495

501496
assertThat(rows).isEqualTo(2L)
@@ -508,9 +503,10 @@ class PersonMapperTest {
508503
val mapper = session.getMapper(PersonMapper::class.java)
509504

510505
val rows = mapper.count {
511-
where(id, isEqualTo(1))
512-
or(id, isEqualTo(2)) {
513-
or(id, isEqualTo(3))
506+
where { id isEqualTo 1 }
507+
or {
508+
id isEqualTo 2
509+
or { id isEqualTo 3 }
514510
}
515511
}
516512

@@ -524,9 +520,10 @@ class PersonMapperTest {
524520
val mapper = session.getMapper(PersonMapper::class.java)
525521

526522
val rows = mapper.count {
527-
where(id, isLessThan(5))
528-
and(id, isLessThan(3)) {
529-
and(id, isEqualTo(1))
523+
where { id isLessThan 5 }
524+
and {
525+
id isLessThan 3
526+
and { id isEqualTo 1 }
530527
}
531528
}
532529

@@ -573,7 +570,7 @@ class PersonMapperTest {
573570
val mapper = session.getMapper(PersonMapper::class.java)
574571

575572
val rows = mapper.select {
576-
where(lastName, isLike(LastName("Fl%")))
573+
where { lastName isLike LastName("Fl%") }
577574
orderBy(id)
578575
}
579576

@@ -588,7 +585,7 @@ class PersonMapperTest {
588585
val mapper = session.getMapper(PersonMapper::class.java)
589586

590587
val rows = mapper.select {
591-
where(lastName, isNotLike(LastName("Fl%")))
588+
where { lastName isNotLike LastName("Fl%") }
592589
orderBy(id)
593590
}
594591

@@ -634,7 +631,7 @@ class PersonMapperTest {
634631
val mapper = session.getMapper(PersonWithAddressMapper::class.java)
635632

636633
val records = mapper.select {
637-
where(id, isEqualTo(1))
634+
where { id isEqualTo 1 }
638635
}
639636

640637
assertThat(records).hasSize(1)
@@ -660,7 +657,7 @@ class PersonMapperTest {
660657
val mapper = session.getMapper(PersonWithAddressMapper::class.java)
661658

662659
val records = mapper.selectDistinct {
663-
where(id, isEqualTo(1))
660+
where { id isEqualTo 1 }
664661
}
665662

666663
assertThat(records).hasSize(1)
@@ -733,7 +730,7 @@ class PersonMapperTest {
733730

734731
val selectStatement = select(address.addressType) {
735732
from(address)
736-
where(address.id, isEqualTo(4))
733+
where { address.id isEqualTo 4 }
737734
}
738735

739736
val type = mapper.selectOptionalInteger(selectStatement)

‎src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonWithAddressMapperExtensions.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.lastName
2525
import examples.kotlin.mybatis3.canonical.PersonDynamicSqlSupport.occupation
2626
import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
2727
import org.mybatis.dynamic.sql.util.kotlin.elements.equalTo
28-
import org.mybatis.dynamic.sql.util.kotlin.elements.isEqualTo
2928
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.select
3029
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.selectDistinct
3130

@@ -62,5 +61,5 @@ fun PersonWithAddressMapper.selectDistinct(completer: SelectCompleter): List<Per
6261

6362
fun PersonWithAddressMapper.selectByPrimaryKey(id_: Int) =
6463
selectOne {
65-
where(id, isEqualTo(id_))
64+
where { id isEqualTo id_ }
6665
}

‎src/test/kotlin/examples/kotlin/mybatis3/column/comparison/ColumnComparisonTest.kt‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ import examples.kotlin.mybatis3.column.comparison.ColumnComparisonDynamicSqlSupp
2020
import examples.kotlin.mybatis3.column.comparison.ColumnComparisonDynamicSqlSupport.number2
2121
import org.assertj.core.api.Assertions.assertThat
2222
import org.junit.jupiter.api.Test
23-
import org.mybatis.dynamic.sql.util.kotlin.elements.isEqualTo
24-
import org.mybatis.dynamic.sql.util.kotlin.elements.isGreaterThan
25-
import org.mybatis.dynamic.sql.util.kotlin.elements.isGreaterThanOrEqualTo
26-
import org.mybatis.dynamic.sql.util.kotlin.elements.isLessThan
27-
import org.mybatis.dynamic.sql.util.kotlin.elements.isLessThanOrEqualTo
28-
import org.mybatis.dynamic.sql.util.kotlin.elements.isNotEqualTo
2923
import org.mybatis.dynamic.sql.util.kotlin.elements.sortColumn
3024
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.select
3125
import org.springframework.beans.factory.annotation.Autowired
@@ -41,7 +35,7 @@ class ColumnComparisonTest {
4135
fun testColumnComparisonLessThan() {
4236
val selectStatement = select(number1, number2) {
4337
from(columnComparison)
44-
where(number1, isLessThan(number2))
38+
where { number1 isLessThan number2 }
4539
orderBy(number1, number2)
4640
}
4741

@@ -61,7 +55,7 @@ class ColumnComparisonTest {
6155
fun testColumnComparisonLessThanOrEqual() {
6256
val selectStatement = select(number1, number2) {
6357
from(columnComparison)
64-
where(number1, isLessThanOrEqualTo(number2))
58+
where { number1 isLessThanOrEqualTo number2 }
6559
orderBy(number1, number2)
6660
}
6761

@@ -81,7 +75,7 @@ class ColumnComparisonTest {
8175
fun testColumnComparisonGreaterThan() {
8276
val selectStatement = select(number1, number2) {
8377
from(columnComparison)
84-
where(number1, isGreaterThan(number2))
78+
where { number1 isGreaterThan number2 }
8579
orderBy(number1, number2)
8680
}
8781

@@ -101,7 +95,7 @@ class ColumnComparisonTest {
10195
fun testColumnComparisonGreaterThanOrEqual() {
10296
val selectStatement = select(number1, number2) {
10397
from(columnComparison)
104-
where(number1, isGreaterThanOrEqualTo(number2))
98+
where { number1 isGreaterThanOrEqualTo number2 }
10599
orderBy(number1, number2)
106100
}
107101

@@ -121,7 +115,7 @@ class ColumnComparisonTest {
121115
fun testColumnComparisonEqual() {
122116
val selectStatement = select(number1, number2) {
123117
from(columnComparison)
124-
where(number1, isEqualTo(number2))
118+
where { number1 isEqualTo number2 }
125119
orderBy(number1, number2)
126120
}
127121

@@ -140,7 +134,7 @@ class ColumnComparisonTest {
140134
fun testColumnComparisonNotEqual() {
141135
val selectStatement = select(number1, number2) {
142136
from(columnComparison, "a")
143-
where(number1, isNotEqualTo(number2))
137+
where { number1 isNotEqualTo number2 }
144138
orderBy(sortColumn("a", number1), sortColumn("a", number2))
145139
}
146140

@@ -159,7 +153,7 @@ class ColumnComparisonTest {
159153
@Test
160154
fun testHelperMethod() {
161155
val records = mapper.select {
162-
where(number1, isNotEqualTo(number2))
156+
where { number1 isNotEqualTo number2 }
163157
orderBy(number1, number2)
164158
}
165159

‎src/test/kotlin/examples/kotlin/mybatis3/custom/render/KCustomRenderingTest.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.TestInstance
3232
import org.mybatis.dynamic.sql.SqlColumn
3333
import org.mybatis.dynamic.sql.util.kotlin.elements.insert
3434
import org.mybatis.dynamic.sql.util.kotlin.elements.insertMultiple
35-
import org.mybatis.dynamic.sql.util.kotlin.elements.isEqualTo
3635
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.deleteFrom
3736
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.insertInto
3837
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.into
@@ -220,7 +219,7 @@ class KCustomRenderingTest {
220219
val updateStatement = update(jsonTest) {
221220
set(info)
222221
.equalTo("{\"firstName\": \"Wilma\", \"lastName\": \"Flintstone\", \"age\": 26}")
223-
where(id, isEqualTo(2))
222+
where { id isEqualTo 2 }
224223
}
225224
val expected = "update JsonTest " +
226225
"set info = #{parameters.p1,jdbcType=VARCHAR}::json " +
@@ -264,7 +263,7 @@ class KCustomRenderingTest {
264263
assertThat(rows).isEqualTo(2)
265264
val selectStatement = select(id, description, info) {
266265
from(jsonTest)
267-
where(dereference(info, "age"), isEqualTo("25"))
266+
where { dereference(info, "age") isEqualTo "25" }
268267
}
269268
val expected = "select id, description, info " +
270269
"from JsonTest " +
@@ -301,7 +300,7 @@ class KCustomRenderingTest {
301300
assertThat(rows).isEqualTo(2)
302301
val selectStatement = select(dereference(info, "firstName").`as`("firstname")) {
303302
from(jsonTest)
304-
where(dereference(info, "age"), isEqualTo("25"))
303+
where { dereference(info, "age") isEqualTo "25" }
305304
}
306305
val expected = "select info->>'firstName' as firstname " +
307306
"from JsonTest " +

0 commit comments

Comments
 (0)