Broken orderby statement JetBrains#1431

naftalmm · Jan 22, 2022 · aec4ee5 · aec4ee5
1 parent 3070d05
commit aec4ee5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/SetOperations.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/SetOperations.kt
@@ -79,8 +79,8 @@ sealed class SetOperation(
 
             if (orderByExpressions.isNotEmpty()) {
                 append(" ORDER BY ")
-                orderByExpressions.appendTo {
-                    append((it.first as? ExpressionAlias<*>)?.alias ?: it.first, " ", it.second.name)
+                orderByExpressions.appendTo { (expression, sortOrder) ->
+                    currentDialect.dataTypeProvider.precessOrderByClause(this, expression, sortOrder)
                 }
             }
 

diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/vendors/Default.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/vendors/Default.kt
@@ -187,8 +187,9 @@ abstract class FunctionProvider {
         }
         append(expr.expr)
         if (expr.orderBy.isNotEmpty()) {
-            expr.orderBy.appendTo(prefix = " ORDER BY ") {
-                append(it.first, " ", it.second.name)
+            append(" ORDER BY ")
+            expr.orderBy.appendTo { (expression, sortOrder) ->
+                currentDialect.dataTypeProvider.precessOrderByClause(this, expression, sortOrder)
             }
         }
         expr.separator?.let {