Skip to content

armgit / txtai

Public Imported from GitHub
0

💡 All-in-one AI framework for semantic search, LLM orchestration and language model workflows

Sort NULL values like SQLite when merging ordered results (#1353)

Raashish Aggarwalb2ff9bd85cbf
diff --git a/src/python/txtai/database/sql/aggregate.py b/src/python/txtai/database/sql/aggregate.py
index dee362dd..e16fc705 100644
--- a/src/python/txtai/database/sql/aggregate.py
+++ b/src/python/txtai/database/sql/aggregate.py
@@ -183,9 +183,9 @@ class Aggregate(SQL):
clause = clause.rsplit(" ")[0]
reverse = True
- # Order by columns must be in select clause
+ # Order by columns must be in select clause. NULLs sort first like in SQLite (last when descending).
if clause in query["select"]:
- results = sorted(results, key=operator.itemgetter(clause), reverse=reverse)
+ results = sorted(results, key=lambda row, column=clause: (row[column] is not None, row[column]), reverse=reverse)
return results
diff --git a/test/python/testdatabase/testsql.py b/test/python/testdatabase/testsql.py
index 1b141101..f9de9163 100644
--- a/test/python/testdatabase/testsql.py
+++ b/test/python/testdatabase/testsql.py
@@ -86,6 +86,17 @@ class TestSQL(unittest.TestCase):
self.assertEqual(aggregate(query, [empty, result]), [result])
self.assertEqual(aggregate(query, [empty, empty]), [empty])
+ def testAggregateOrderByNull(self):
+ """
+ Test Aggregate orders NULL values the same way as SQLite
+ """
+
+ aggregate = Aggregate()
+
+ results = [{"id": "a", "price": 3.0}, {"id": "b", "price": None}, {"id": "c", "price": 1.0}]
+ self.assertEqual([x["id"] for x in aggregate("select id, price from txtai order by price", results)], ["b", "c", "a"])
+ self.assertEqual([x["id"] for x in aggregate("select id, price from txtai order by price desc", results)], ["a", "c", "b"])
+
def testAlias(self):
"""
Test alias clauses