GH-77 Order by aggregated column (Resolve #77)

dzikoysk · May 22, 2024 · c83b82f · c83b82f
1 parent db8c451
commit c83b82f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/sqiffy/src/main/kotlin/com/dzikoysk/sqiffy/dsl/statements/SelectStatement.kt b/sqiffy/src/main/kotlin/com/dzikoysk/sqiffy/dsl/statements/SelectStatement.kt
@@ -88,7 +88,7 @@ open class SelectStatement(
         this.offset = offset
     }
 
-    fun orderBy(vararg columns: Pair<Column<*>, Order>): SelectStatement = also {
+    fun orderBy(vararg columns: Pair<Selectable, Order>): SelectStatement = also {
         require(this.orderBy == null) { "Order by clause is already defined" }
         this.orderBy = columns
             .map { OrderBy(it.first, it.second) }
@@ -102,7 +102,10 @@ open class SelectStatement(
                 .filter { !groupByColumns.contains(it) }
                 .takeIf { it.isNotEmpty() }
                 ?.let { nonAggregatedColumns ->
-                    database.logger.log(Level.WARN, "Non-aggregated columns: $nonAggregatedColumns used with group by clause")
+                    database.logger.log(
+                        Level.WARN,
+                        "Non-aggregated columns: $nonAggregatedColumns used with group by clause"
+                    )
                 }
         }
 
@@ -157,4 +160,7 @@ open class SelectStatement(
         }
     }
 
+    fun <R> toSet(mapper: (Row) -> R): Set<R> =
+        map(mapper).toSet()
+
 }