Implement get_homogeneous_pages and select_homogeneous_pages

sqlakeyset/__init__.py

@@ -1,4 +1,12 @@
-from .paging import get_page, select_page, InvalidPage
+from .paging import (
+    get_homogeneous_pages,
+    get_page,
+    select_homogeneous_pages,
+    select_page,
+    InvalidPage,
+    OrmPageRequest,
+    PageRequest,
+)
 from .results import (
     Page,
     Paging,
@@ -15,11 +23,15 @@
 from .types import Keyset, Marker
 
 __all__ = [
+    "get_homogeneous_pages",
     "get_page",
+    "select_homogeneous_pages",
     "select_page",
     "serialize_bookmark",
     "unserialize_bookmark",
     "Page",
+    "PageRequest",
+    "OrmPageRequest",
     "Paging",
     "Keyset",
     "Marker",

sqlakeyset/columns.py

@@ -366,9 +366,8 @@ def derive_order_key(ocol, desc, index):
         else:
             return None
 
-    entity = desc["entity"]
     expr = desc["expr"]
-
+    entity = desc.get("entity")
     if isinstance(expr, Bundle):
         for key, col in dict(expr.columns).items():
             if strip_labels(col).compare(ocol.comparable_value):
@@ -409,7 +408,7 @@ def derive_order_key(ocol, desc, index):
 
     # is an attribute with label
     try:
-        if ocol.quoted_full_name == OC(expr).full_name:
+        if ocol.quoted_full_name == OC(expr).quoted_full_name:
             return DirectColumn(ocol, index)
     except sqlalchemy.exc.ArgumentError:
         pass