From 6a58148a89e4b1a844f4e85b9605e39bc317fc02 Mon Sep 17 00:00:00 2001
From: Lex Berezhny <lex@damoti.com>
Date: Sat, 21 Mar 2020 18:16:25 -0400
Subject: [PATCH] added support for --order_by=none

---
 lbry/extras/daemon/daemon.py | 6 +++---
 lbry/wallet/database.py      | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lbry/extras/daemon/daemon.py b/lbry/extras/daemon/daemon.py
index 79c30c1fa..e8ff30a6f 100644
--- a/lbry/extras/daemon/daemon.py
+++ b/lbry/extras/daemon/daemon.py
@@ -4164,7 +4164,7 @@ class Daemon(metaclass=JSONRPCServerType):
                      ]
                      [--exclude_internal_transfers]
                      [--wallet_id=<wallet_id>] [--page=<page>] [--page_size=<page_size>]
-                     [--resolve] [--no_totals]
+                     [--resolve] [--order_by=<order_by>][--no_totals]
 
         Options:
             --type=<type>              : (str or list) claim type: stream, channel, support,
@@ -4190,7 +4190,7 @@ class Daemon(metaclass=JSONRPCServerType):
             --page=<page>              : (int) page to return during paginating
             --page_size=<page_size>    : (int) number of items on page during pagination
             --resolve                  : (bool) resolves each claim to provide additional metadata
-            --order_by=<order_by>      : (str) field to order by: 'name', 'height', 'amount'
+            --order_by=<order_by>      : (str) field to order by: 'name', 'height', 'amount' and 'none'
             --no_totals                : (bool) do not calculate the total number of pages and items in result set
                                                 (significant performance boost)
 
@@ -4213,7 +4213,7 @@ class Daemon(metaclass=JSONRPCServerType):
         if order_by is not None:
             if order_by == 'name':
                 constraints['order_by'] = 'txo.claim_name'
-            elif order_by in ('height', 'amount'):
+            elif order_by in ('height', 'amount', 'none'):
                 constraints['order_by'] = order_by
             else:
                 raise ValueError(f"'{order_by}' is not a valid --order_by value.")
diff --git a/lbry/wallet/database.py b/lbry/wallet/database.py
index abae15d07..d8265459e 100644
--- a/lbry/wallet/database.py
+++ b/lbry/wallet/database.py
@@ -787,6 +787,8 @@ class Database(SQLiteMixin):
             constraints['order_by'] = [
                 "tx.height=0 DESC", "tx.height DESC", "tx.position DESC", "txo.position"
             ]
+        elif constraints.get('order_by', None) == 'none':
+            del constraints['order_by']
 
         rows = await self.select_txos(', '.join(select_columns), read_only=read_only, **constraints)