Skip to content

Commit c037073

Browse files
committed
Revert-mistaken remove concat method. And add test-case
1 parent 0c85c22 commit c037073

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/expression/KExpressions.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,13 @@ object KExpressions {
200200
return Expressions.concat(left, right)
201201
}
202202

203+
fun <PROPERTY> concat(
204+
left: PropertyMetamodel<PROPERTY>,
205+
right: PropertyMetamodel<PROPERTY>,
206+
): Concat<PROPERTY> {
207+
return Expressions.concat(left, right)
208+
}
209+
203210
fun <PROPERTY> lower(
204211
propertyMetamodel: PropertyMetamodel<PROPERTY>,
205212
): StringExpression.Lower<PROPERTY> {

doma-kotlin/src/test/kotlin/org/seasar/doma/jdbc/criteria/KNativeSqlSelectTest.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,9 +1533,13 @@ internal class KNativeSqlSelectTest {
15331533
@Test
15341534
fun expression_concat() {
15351535
val e = Emp_()
1536-
val stmt = nativeSql.from(e).select(concat(e.name, "a"))
1536+
val stmt = nativeSql.from(e).select(
1537+
concat(e.name, "a"),
1538+
concat("a", e.name),
1539+
concat(e.name, e.name),
1540+
)
15371541
val sql = stmt.asSql()
1538-
assertEquals("select concat(t0_.NAME, 'a') from EMP t0_", sql.formattedSql)
1542+
assertEquals("select concat(t0_.NAME, 'a'), concat('a', t0_.NAME), concat(t0_.NAME, t0_.NAME) from EMP t0_", sql.formattedSql)
15391543
}
15401544

15411545
@Test

0 commit comments

Comments
 (0)