#30: Remove is_limited

ral-facilities · Aug 10, 2019 · 38b9ec0 · 38b9ec0
1 parent 288b21b
commit 38b9ec0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/common/database_helpers.py b/common/database_helpers.py
@@ -16,7 +16,6 @@ def __init__(self, table):
         self.session = session_manager.get_icat_db_session()
         self.table = table
         self.base_query = self.session.query(table)
-        self.is_limited = False
 
     @abstractmethod
     def execute_query(self):
@@ -141,8 +140,6 @@ def __init__(self, field, direction):
         self.direction = direction
 
     def apply_filter(self, query):
-        if query.is_limited:
-            query.base_query = query.base_query.from_self()
         if self.direction.upper() == "ASC":
             query.base_query = query.base_query.order_by(asc(self.field.upper()))
         elif self.direction.upper() == "DESC":
@@ -169,7 +166,6 @@ def __init__(self, limit_value):
 
     def apply_filter(self, query):
         query.base_query = query.base_query.limit(self.limit_value)
-        query.is_limited = True
 
 
 class IncludeFilter(QueryFilter):