WIP

djaosdb/caosdb_client.py

@@ -35,18 +35,18 @@ class CountResult(Result):
 
 class FindResult(Result):
 
-    def __init__(self, rows, columns, sort=None, limit=None):
+    def __init__(self, rows, columns, sort=None, limit=None, skip=None):
         super(FindResult, self).__init__()
         self._results = []
         self._sort = sort
 
-        for row in rows:
-            self._results.append(dict(zip(columns, row)))
+        upper = (skip + limit if skip is not None and limit is not None else
+                 limit)
 
         # todo sort
+        for row in rows[skip:upper]:
+            self._results.append(dict(zip(columns, row)))
 
-        if limit is not None:
-            self._results = self._results[0:limit]
 
     def __iter__(self):
         return iter(self._results)
@@ -149,11 +149,11 @@ class DefaultCaosDBClientDelegate:
         query = f'FIND RECORD "{record_type}"{filter_clause}'
         return self._caosdb.execute_query(query)
 
-    def find(self, record_type, *args, **kwargs):
+    def find(self, record_type, limit=None, sort=None, skip=None, *args, **kwargs):
         res = self._find(record_type, *args, **kwargs)
         projection = kwargs["projection"]
         rows = res.get_property_values(*projection)
-        return FindResult(rows, projection)
+        return FindResult(rows, projection, sort, limit, skip)
 
     def list_record_type_names(self):
         res = self._caosdb.execute_query("SELECT name FROM RECORDTYPE")

djaosdb/models/manager.py

@@ -7,23 +7,18 @@ class DjaosdbManager(Manager):
 
     def __init__(self):
         super().__init__()
-        LOGGER.debug("################# init")
         self._db = "caosdb"
 
     @property
     def db(self):
         db = super().db()
-        LOGGER.debug("################################################## db = %s", db)
         return db
 
     def get_queryset(self):
         qs = super().get_queryset()
-        LOGGER.debug("################################## dir = %s", dir(qs))
-        LOGGER.debug("################################## db = %s", qs.db)
         return qs
 
     def db_manager(self):
-        LOGGER.debug("################################## db_manager _db = %s", self._db)
         return super().db_manager()
 
 

djaosdb/sql2mongo/query.py

@@ -850,7 +850,6 @@ class Query:
             self._result_generator = iter(self)
 
         result = next(self._result_generator)
-        logger.debug(f'Result: {result}')
         return result
 
     next = __next__