sqlalchemy-iris 0.17.1b8__py3-none-any.whl → 0.17.2b1__py3-none-any.whl

sqlalchemy_iris/base.py

@@ -408,10 +408,21 @@ class IRISCompiler(sql.compiler.SQLCompiler):
             return "EXISTS(%s)" % self.process(element.element, **kw)
 
     def limit_clause(self, select, **kw):
-        return ""
+        # handle the limit and offset clauses
+        if select._has_row_limiting_clause and not self._use_top(select):
+            limit_clause = self._get_limit_or_fetch(select)
+            offset_clause = select._offset_clause
 
-    def fetch_clause(self, select, **kw):
-        return ""
+            if limit_clause is not None:
+                if offset_clause is not None:
+                    return " LIMIT %s OFFSET %s" % (
+                        self.process(limit_clause, **kw),
+                        self.process(offset_clause, **kw),
+                    )
+                else:
+                    return " LIMIT %s" % self.process(limit_clause, **kw)
+            else:
+                return ""
 
     def visit_empty_set_expr(self, type_, **kw):
         return "SELECT 1 WHERE 1!=1"
@@ -541,16 +552,39 @@ class IRISCompiler(sql.compiler.SQLCompiler):
         if not (select._has_row_limiting_clause and not self._use_top(select)):
             return select
 
-        """Look for ``LIMIT`` and OFFSET in a select statement, and if
-        so tries to wrap it in a subquery with ``row_number()`` criterion.
+        # check the current version of the iris server
+        server_version = self.dialect.server_version_info
 
-        """
+        if server_version is None or server_version < (2025, 1):
+            return self._handle_legacy_pagination(select, select_stmt)
+        else:
+            return self._handle_modern_pagination(select, select_stmt)
+
+    def _get_default_order_by(self, select_stmt, select):
+        """Get default ORDER BY clauses when none are specified."""
         _order_by_clauses = [
             sql_util.unwrap_label_reference(elem)
             for elem in select._order_by_clause.clauses
         ]
+
         if not _order_by_clauses:
-            _order_by_clauses = [text("%id")]
+            # If no ORDER BY clause, use the primary key
+            if select_stmt.froms and isinstance(select_stmt.froms[0], schema.Table):
+                table = select.froms[0]
+                if table.primary_key and table.primary_key.columns:
+                    _order_by_clauses = [
+                        sql_util.unwrap_label_reference(c)
+                        for c in table.primary_key.columns
+                    ]
+                else:
+                    # If no primary key, use the id column
+                    _order_by_clauses = [text("%id")]
+
+        return _order_by_clauses
+
+    def _handle_legacy_pagination(self, select, select_stmt):
+        """Handle pagination for IRIS versions before 2025.1 using ROW_NUMBER()."""
+        _order_by_clauses = self._get_default_order_by(select_stmt, select)
 
         limit_clause = self._get_limit_or_fetch(select)
         offset_clause = select._offset_clause
@@ -566,6 +600,7 @@ class IRISCompiler(sql.compiler.SQLCompiler):
 
         iris_rn = sql.column(label)
         limitselect = sql.select(*[c for c in select.c if c.key != label])
+
         if offset_clause is not None:
             if limit_clause is not None:
                 limitselect = limitselect.where(
@@ -574,9 +609,23 @@ class IRISCompiler(sql.compiler.SQLCompiler):
             else:
                 limitselect = limitselect.where(iris_rn > offset_clause)
         else:
-            limitselect = limitselect.where(iris_rn <= (limit_clause))
+            limitselect = limitselect.where(iris_rn <= limit_clause)
+
         return limitselect
 
+    def _handle_modern_pagination(self, select, select_stmt):
+        """Handle pagination for IRIS 2025.1+ using native LIMIT/OFFSET."""
+        _order_by_clauses = self._get_default_order_by(select_stmt, select)
+
+        new_select = select._generate().order_by(*_order_by_clauses)
+
+        # Apply limit if present
+        if select._limit_clause is not None:
+            new_select = new_select.limit(select._limit_clause)
+
+        return new_select
+
+
     def order_by_clause(self, select, **kw):
         order_by = self.process(select._order_by_clause, **kw)
 

{sqlalchemy_iris-0.17.1b8.dist-info → sqlalchemy_iris-0.17.2b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlalchemy-iris
-Version: 0.17.1b8
+Version: 0.17.2b1
 Summary: InterSystems IRIS for SQLAlchemy
 Home-page: https://github.com/caretdev/sqlalchemy-iris
 Maintainer: CaretDev

{sqlalchemy_iris-0.17.1b8.dist-info → sqlalchemy_iris-0.17.2b1.dist-info}/RECORD

@@ -65,7 +65,7 @@ irisnative/_IRISNative.py,sha256=HQ4nBhc8t8_5OtxdMG-kx1aa-T1znf2I8obZOPLOPzg,665
 irisnative/__init__.py,sha256=6YmvBLQSURsCPKaNg7LK-xpo4ipDjrlhKuwdfdNb3Kg,341
 sqlalchemy_iris/__init__.py,sha256=79niafYbL1XOw3eJfu0KwrHfP8CIb2I4HdN4B9PI_sQ,1297
 sqlalchemy_iris/alembic.py,sha256=L58qBIj6HwLmtU6FS5RXKW0gHr1mNTrBSChEllSh1n0,6607
-sqlalchemy_iris/base.py,sha256=MpTfNab_5nQaZZlWpe0jv4Biv7xMvfx__m0xrDQzhHk,54545
+sqlalchemy_iris/base.py,sha256=30Qn-bbCqze5BQKr_W_GYjAmrolIYJ538QtAqcR3FVA,56654
 sqlalchemy_iris/embedded.py,sha256=5WZ78PIYB_pPyaLrK4E7kHUsGBRiwzYHjsTDiNYHUGg,819
 sqlalchemy_iris/information_schema.py,sha256=FUL3z_viGjjOvDA71Mbk5k94dUGcLV4dW1xHxBgM1rk,6188
 sqlalchemy_iris/iris.py,sha256=Of0Ruc9W2c5ll5sjAy1xRo4tf1m0l_ab0vAdacTv3Yw,276
@@ -75,9 +75,9 @@ sqlalchemy_iris/requirements.py,sha256=9Klyec0qS2MHEaXbONauP7FUF5bi__vfsBrwOEKKT
 sqlalchemy_iris/types.py,sha256=M5uyeANVN6MU40kiWBePGTCnVaAAKmfLOHq7zuJ0z6A,12024
 sqlalchemy_iris/intersystems/__init__.py,sha256=J1WcKKAfEASHTmxCav_sGQeb2GE-FXgrgWnUDY8zMag,5463
 sqlalchemy_iris/intersystems/dbapi.py,sha256=JOPjpXrD_cwCzAwnO9cRwBtv2SM8YbczOk8PFX3oM_4,899
-sqlalchemy_iris-0.17.1b8.dist-info/licenses/LICENSE,sha256=RQmigqltsLq8lfOBc_KwtL0gkODyUCNpU-0ZiZwGlho,1075
-sqlalchemy_iris-0.17.1b8.dist-info/METADATA,sha256=8WXI4b7fN-crWcrFY9TDWcnZcPIXJDKMfL85asLvZT0,4195
-sqlalchemy_iris-0.17.1b8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlalchemy_iris-0.17.1b8.dist-info/entry_points.txt,sha256=sYU1YvyyeGqOVVMpHySThfEhrVQL1lUVz5rDwmwCj7E,258
-sqlalchemy_iris-0.17.1b8.dist-info/top_level.txt,sha256=QRY18YUXUJrRde4aayj_brj0lr2LBRVZS1ZoVoDFVS0,45
-sqlalchemy_iris-0.17.1b8.dist-info/RECORD,,
+sqlalchemy_iris-0.17.2b1.dist-info/licenses/LICENSE,sha256=RQmigqltsLq8lfOBc_KwtL0gkODyUCNpU-0ZiZwGlho,1075
+sqlalchemy_iris-0.17.2b1.dist-info/METADATA,sha256=Vyd-lYMaHD1urTk6AoDDKhNHzZhQDIk-aGQfrOsSX_Y,4195
+sqlalchemy_iris-0.17.2b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlalchemy_iris-0.17.2b1.dist-info/entry_points.txt,sha256=sYU1YvyyeGqOVVMpHySThfEhrVQL1lUVz5rDwmwCj7E,258
+sqlalchemy_iris-0.17.2b1.dist-info/top_level.txt,sha256=QRY18YUXUJrRde4aayj_brj0lr2LBRVZS1ZoVoDFVS0,45
+sqlalchemy_iris-0.17.2b1.dist-info/RECORD,,