[vdsql-] use intermediate expr with order_by with filter #1856

saulpw · Jul 7, 2023 · a5a6d38 · a5a6d38
1 parent 96ce226
commit a5a6d38
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/visidata/apps/vdsql/_ibis.py b/visidata/apps/vdsql/_ibis.py
@@ -284,12 +284,19 @@ def ibis_filter(self):
 
     @property
     def pending_expr(self):
+        import ibis
         q = self.get_current_expr(typed=True)
         if self.ibis_selection:
             q = q.filter(self.ibis_filter)
 
         if self._ordering:
-            q = q.order_by([(col.get_ibis_col(self.query), not rev) for col, rev in self._ordering])
+            colorder = []
+            for col, rev in self._ordering:
+                ibiscol = col.get_ibis_col(q)  #1856
+                if rev:
+                    ibiscol = ibis.desc(ibiscol)
+                colorder.append(ibiscol)
+            q = q.order_by(colorder)
 
         return q