orderBy with boolean sort parameters was deprecated

JetBrains · Jan 30, 2019 · 6b61977 · 6b61977
1 parent 19199b8
commit 6b61977
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/kotlin/org/jetbrains/exposed/sql/Query.kt b/src/main/kotlin/org/jetbrains/exposed/sql/Query.kt
@@ -239,14 +239,19 @@ open class Query(set: FieldSet, where: Op<Boolean>?): SizedIterable<ResultRow>,
         return this
     }
 
-    fun orderBy(column: Expression<*>, isAsc: Boolean = true) : Query = orderBy(column to isAsc)
+    @Deprecated("use orderBy with SortOrder instead")
+    @JvmName("orderByDeprecated")
+    fun orderBy(column: Expression<*>, isAsc: Boolean) : Query = orderBy(column to isAsc)
 
+    fun orderBy(column: Expression<*>, order: SortOrder = SortOrder.ASC) = orderBy(column to order)
+
+    @Deprecated("use orderBy with SortOrder instead")
+    @JvmName("orderByDeprecated2")
     fun orderBy(vararg columns: Pair<Expression<*>, Boolean>) : Query {
         (orderByExpressions as MutableList).addAll(columns.map{ it.first to if(it.second) SortOrder.ASC else SortOrder.DESC })
         return this
     }
 
-    @JvmName("orderBy2")
     fun orderBy(vararg columns: Pair<Expression<*>, SortOrder>) : Query {
         (orderByExpressions as MutableList).addAll(columns)
         return this

diff --git a/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DMLTests.kt b/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DMLTests.kt
@@ -681,8 +681,8 @@ class DMLTests : DatabaseTestsBase() {
 
     @Test
     fun orderBy02() {
-        withCitiesAndUsers { cities, users, userData ->
-            val r = users.selectAll().orderBy(users.cityId, false).orderBy(users.id).toList()
+        withCitiesAndUsers { _, users, _ ->
+            val r = users.selectAll().orderBy(users.cityId, SortOrder.DESC).orderBy(users.id).toList()
             assertEquals(5, r.size)
             val usersWithoutCities = listOf("alex", "smth")
             val otherUsers = listOf("eugene", "sergey", "andrey")
@@ -898,7 +898,7 @@ class DMLTests : DatabaseTestsBase() {
             val substring = users.name.substring(1, 2)
             cities.insert(users.slice(substring).selectAll().orderBy(users.id).limit(2))
 
-            val r = cities.slice(cities.name).selectAll().orderBy(cities.id, false).limit(2).toList()
+            val r = cities.slice(cities.name).selectAll().orderBy(cities.id, SortOrder.DESC).limit(2).toList()
             assertEquals(2, r.size)
             assertEquals("An", r[0][cities.name])
             assertEquals("Al", r[1][cities.name])