fix #40

src/utils_flask_sqla/generic.py

@@ -237,10 +237,14 @@ def build_query_order(self, query, parameters):
             return query.order_by(ordel_col)
         return query
 
-    def raw_query(self, process_filter=True):
+    def set_limit(self, q):
+        return q.limit(self.limit).offset(self.offset * self.limit)
+
+    def raw_query(self, process_filter=True, with_limit=True):
         """
         Renvoie la requete 'brute' (sans .all)
         - process_filter: application des filtres (et du sort)
+        - with_limit: application de la limite sur la query
         """
 
         q = self.DB.session.query(self.view.tableDef)
@@ -251,24 +255,24 @@ def raw_query(self, process_filter=True):
             unordered_q = self.build_query_filters(q, self.filters)
             q = self.build_query_order(unordered_q, self.filters)
 
-        if self.limit != -1:
-            q = q.limit(self.limit).offset(self.offset * self.limit)
+        if self.limit != -1 and with_limit:
+            q = self.set_limit(q)
 
         return q
 
     def query(self):
         """
         Lance la requete et retourne l'objet sqlalchemy
         """
-        q = self.raw_query(process_filter=False)
+        q = self.DB.session.query(self.view.tableDef)
         nb_result_without_filter = q.count()
 
-        q = self.raw_query()
-        nb_results = q.count() if self.filters else nb_result_without_filter
+        q = self.raw_query(process_filter=True, with_limit=False)
+        total_filtered = q.count() if self.filters else nb_result_without_filter
 
-        data = q.all()
+        data = self.set_limit(q).all()
 
-        return data, nb_result_without_filter, nb_results
+        return data, nb_result_without_filter, total_filtered
 
     def return_query(self):
         """