TypeDAL 3.10.4__tar.gz → 3.11.0__tar.gz

{typedal-3.10.4 → typedal-3.11.0}/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 <!--next-version-placeholder-->
 
+## v3.11.0 (2025-04-25)
+
+### Fix
+
+* Add `._count()` to get sql for `.count()` ([`6a336e9`](https://github.com/trialandsuccess/TypeDAL/commit/6a336e903017a2fcfac9bea313f150e5af8d77de))
+* Add `.exists()` method on querybuilder to check if there are any rows (using `.count()`) ([`7e54e64`](https://github.com/trialandsuccess/TypeDAL/commit/7e54e64461e04f6e65a9aa4d1736585f088bc9d1))
+
+## v3.10.5 (2025-04-22)
+
+### Fix
+
+* `repr(rows)` crashed when `rows` contained no data ([`cc3b2d0`](https://github.com/trialandsuccess/TypeDAL/commit/cc3b2d0bd332faee579e6fdfb7068bd511f22093))
+
 ## v3.10.4 (2025-04-17)
 
 ### Fix

{typedal-3.10.4 → typedal-3.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TypeDAL
-Version: 3.10.4
+Version: 3.11.0
 Summary: Typing support for PyDAL
 Project-URL: Documentation, https://typedal.readthedocs.io/
 Project-URL: Issues, https://github.com/trialandsuccess/TypeDAL/issues

typedal-3.11.0/coverage.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="122" height="20" role="img" aria-label="coverage: 100.00%"><title>coverage: 100.00%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="122" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="61" height="20" fill="#4c1"/><rect width="122" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="905" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">100.00%</text><text x="905" y="140" transform="scale(.1)" fill="#fff" textLength="510">100.00%</text></g></svg>

{typedal-3.10.4 → typedal-3.11.0}/src/typedal/__about__.py

@@ -5,4 +5,4 @@ This file contains the Version info for this package.
 # SPDX-FileCopyrightText: 2023-present Robin van der Noord <robinvandernoord@gmail.com>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "3.10.4"
+__version__ = "3.11.0"

{typedal-3.10.4 → typedal-3.11.0}/src/typedal/core.py

@@ -1041,6 +1041,12 @@ class TableMeta(type):
         """
         return QueryBuilder(self).count()
 
+    def exists(self: Type[T_MetaInstance]) -> bool:
+        """
+        See QueryBuilder.exists!
+        """
+        return QueryBuilder(self).exists()
+
     def first(self: Type[T_MetaInstance]) -> T_MetaInstance | None:
         """
         See QueryBuilder.first!
@@ -1977,7 +1983,11 @@ class TypedRows(typing.Collection[T_MetaInstance], Rows):
         Print a table on repr().
         """
         data = self.as_dict()
-        headers = list(next(iter(data.values())).keys())
+        try:
+            headers = list(next(iter(data.values())).keys())
+        except StopIteration:
+            headers = []
+
         return mktable(data, headers)
 
     def group_by_value(
@@ -2784,14 +2794,10 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
         """
         yield from self.collect()
 
-    def count(self, distinct: bool = None) -> int:
-        """
-        Return the amount of rows matching the current query.
-        """
-        db = self._get_db()
+    def __count(self, db: TypeDAL, distinct: bool = None):
+        # internal, shared logic between .count and ._count
         model = self.model
         query = self.query
-
         for key, relation in self.relationships.items():
             if (not relation.condition or relation.join != "inner") and not distinct:
                 continue
@@ -2802,8 +2808,37 @@ class QueryBuilder(typing.Generic[T_MetaInstance]):
                 other = other.with_alias(f"{key}_{hash(relation)}")
             query &= relation.condition(model, other)
 
+        return query
+
+    def count(self, distinct: bool = None) -> int:
+        """
+        Return the amount of rows matching the current query.
+        """
+        db = self._get_db()
+        query = self.__count(db, distinct=distinct)
+
         return db(query).count(distinct)
 
+    def _count(self, distinct: bool = None):
+        """
+        Return the SQL for .count().
+        """
+        db = self._get_db()
+        query = self.__count(db, distinct=distinct)
+
+        return db(query)._count(distinct)
+
+    def exists(self) -> bool:
+        """
+        Determines if any records exist matching the current query.
+
+        Returns True if one or more records exist; otherwise, False.
+
+        Returns:
+            bool: A boolean indicating whether any records exist.
+        """
+        return bool(self.count())
+
     def __paginate(
         self,
         limit: int,

{typedal-3.10.4 → typedal-3.11.0}/tests/test_query_builder.py

@@ -318,6 +318,9 @@ def test_complex_join():
 
     assert builder.count() == 4 == len(builder.collect())
 
+    count_sql = builder._count()
+    assert "COUNT(" in count_sql
+
     sql = builder._collect()
     assert "JOIN" in sql
     assert "LEFT" not in sql

{typedal-3.10.4 → typedal-3.11.0}/tests/test_row.py

@@ -214,3 +214,7 @@ def test_rows():
     assert len(empty) == 0
     assert len(empty.exclude(lambda x: x)) == 0
     assert len(empty.find(lambda x: x)) == 0
+
+    empty_rows = NewStyleClass.where(NewStyleClass.id < 0).collect()
+    assert str(empty_rows)
+    assert repr(empty_rows)

{typedal-3.10.4 → typedal-3.11.0}/tests/test_table.py

@@ -123,6 +123,7 @@ def test_both_styles_for_class():
 
     assert db(old_style).count() == 0
     assert NewStyle.count() == 0
+    assert not NewStyle.exists()
 
     with pytest.raises(Exception):
         old_style.insert(string_field=123, int_field="abc")

{typedal-3.10.4 → typedal-3.11.0}/tests/timings.py

@@ -89,6 +89,7 @@ def selects_pydal():
 
 def selects_typedal():
     assert TimeTable.count()
+    assert TimeTable.exists()
     assert TimeTable(1)
     assert TimeTable(id=1)
     assert TimeTable.where(TimeTable.id == 1).first()

typedal-3.10.4/coverage.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="122" height="20" role="img" aria-label="coverage: 100.00%"><title>coverage: 100.00%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="122" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="61" height="20" fill="#4c1"/><rect width="122" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="905" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">100.00%</text><text x="905" y="140" transform="scale(.1)" fill="#fff" textLength="510">100.00%</text></g></svg>