use order of original query when adding user_emoji info

andreaskoepf · andreaskoepf · commit 2005ad391b8d · 2023-02-23T19:20:30.000+01:00
diff --git a/backend/oasst_backend/prompt_repository.py b/backend/oasst_backend/prompt_repository.py
@@ -888,6 +888,7 @@ def _add_user_emojis_all(self, qry: Query) -> list[Message]:
         if self.user_id is None:
             return qry.all()
 
+        order_by_clauses = qry._order_by_clauses
         sq = qry.subquery("m")
         qry = (
             self.db.query(Message, func.string_agg(MessageEmoji.emoji, literal_column("','")).label("user_emojis"))
@@ -902,6 +903,7 @@ def _add_user_emojis_all(self, qry: Query) -> list[Message]:
             )
             .group_by(sq)
         )
+        qry._order_by_clauses = order_by_clauses
         messages: list[Message] = []
         for x in qry:
             m: Message = x.Message

Original file line number	Diff line number	Diff line change
`@@ -888,6 +888,7 @@ def _add_user_emojis_all(self, qry: Query) -> list[Message]:`
`888`	`888`	`if self.user_id is None:`
`889`	`889`	`return qry.all()`
`890`	`890`
	`891`	`+ order_by_clauses = qry._order_by_clauses`
`891`	`892`	`sq = qry.subquery("m")`
`892`	`893`	`qry = (`
`893`	`894`	`self.db.query(Message, func.string_agg(MessageEmoji.emoji, literal_column("','")).label("user_emojis"))`
`@@ -902,6 +903,7 @@ def _add_user_emojis_all(self, qry: Query) -> list[Message]:`
`902`	`903`	`)`
`903`	`904`	`.group_by(sq)`
`904`	`905`	`)`
	`906`	`+ qry._order_by_clauses = order_by_clauses`
`905`	`907`	`messages: list[Message] = []`
`906`	`908`	`for x in qry:`
`907`	`909`	`m: Message = x.Message`