plain.models 0.41.1__py3-none-any.whl → 0.43.0__py3-none-any.whl

plain/models/query.py

@@ -255,9 +255,8 @@ class FlatValuesListIterable(BaseIterable):
 class QuerySet:
     """Represent a lazy database lookup for a set of objects."""
 
-    def __init__(self, model=None, query=None, hints=None):
+    def __init__(self, *, model=None, query=None):
         self.model = model
-        self._hints = hints or {}
         self._query = query or sql.Query(self.model)
         self._result_cache = None
         self._sticky_filter = False
@@ -284,17 +283,6 @@ class QuerySet:
             self._iterable_class = ValuesIterable
         self._query = value
 
-    def as_manager(cls):
-        # Address the circular dependency between `Queryset` and `Manager`.
-        from plain.models.manager import Manager
-
-        manager = Manager.from_queryset(cls)()
-        manager._built_with_as_manager = True
-        return manager
-
-    as_manager.queryset_only = True
-    as_manager = classmethod(as_manager)
-
     ########################
     # PYTHON MAGIC METHODS #
     ########################
@@ -425,12 +413,12 @@ class QuerySet:
         query = (
             self
             if self.query.can_filter()
-            else self.model._base_manager.filter(id__in=self.values("id"))
+            else self.model._meta.base_queryset.filter(id__in=self.values("id"))
         )
         combined = query._chain()
         combined._merge_known_related_objects(other)
         if not other.query.can_filter():
-            other = other.model._base_manager.filter(id__in=other.values("id"))
+            other = other.model._meta.base_queryset.filter(id__in=other.values("id"))
         combined.query.combine(other.query, sql.OR)
         return combined
 
@@ -444,12 +432,12 @@ class QuerySet:
         query = (
             self
             if self.query.can_filter()
-            else self.model._base_manager.filter(id__in=self.values("id"))
+            else self.model._meta.base_queryset.filter(id__in=self.values("id"))
         )
         combined = query._chain()
         combined._merge_known_related_objects(other)
         if not other.query.can_filter():
-            other = other.model._base_manager.filter(id__in=other.values("id"))
+            other = other.model._meta.base_queryset.filter(id__in=other.values("id"))
         combined.query.combine(other.query, sql.XOR)
         return combined
 
@@ -957,8 +945,6 @@ class QuerySet:
         self._result_cache = None
         return deleted, _rows_count
 
-    delete.queryset_only = True
-
     def _raw_delete(self):
         """
         Delete objects found from the given queryset in single direct SQL
@@ -1027,8 +1013,6 @@ class QuerySet:
         self._result_cache = None
         return query.get_compiler().execute_sql(CURSOR)
 
-    _update.queryset_only = False
-
     def exists(self):
         """
         Return True if the QuerySet would have any results, False otherwise.
@@ -1201,7 +1185,7 @@ class QuerySet:
     def all(self):
         """
         Return a new QuerySet that is a copy of the current one. This allows a
-        QuerySet to proxy for a model manager in some cases.
+        QuerySet to proxy for a model queryset in some cases.
         """
         return self._chain()
 
@@ -1565,8 +1549,6 @@ class QuerySet:
         query.insert_values(fields, objs, raw=raw)
         return query.get_compiler().execute_sql(returning_fields)
 
-    _insert.queryset_only = False
-
     def _batched_insert(
         self,
         objs,
@@ -1622,7 +1604,6 @@ class QuerySet:
         c = self.__class__(
             model=self.model,
             query=self.query.chain(),
-            hints=self._hints,
         )
         c._sticky_filter = self._sticky_filter
         c._for_write = self._for_write
@@ -1678,15 +1659,6 @@ class QuerySet:
         query = self.query.resolve_expression(*args, **kwargs)
         return query
 
-    resolve_expression.queryset_only = True
-
-    def _add_hints(self, **hints):
-        """
-        Update hinting information for use by routers. Add new key/values or
-        overwrite existing key/values.
-        """
-        self._hints.update(hints)
-
     def _has_filters(self):
         """
         Check if this QuerySet has any filtering going on. This isn't
@@ -1747,11 +1719,9 @@ class RawQuerySet:
         query=None,
         params=(),
         translations=None,
-        hints=None,
     ):
         self.raw_query = raw_query
         self.model = model
-        self._hints = hints or {}
         self.query = query or sql.RawQuery(sql=raw_query, params=params)
         self.params = params
         self.translations = translations or {}
@@ -1797,7 +1767,6 @@ class RawQuerySet:
             query=self.query,
             params=self.params,
             translations=self.translations,
-            hints=self._hints,
         )
         c._prefetch_related_lookups = self._prefetch_related_lookups[:]
         return c
@@ -2180,7 +2149,7 @@ def prefetch_one_level(instances, prefetcher, lookup, level):
         for additional_lookup in getattr(rel_qs, "_prefetch_related_lookups", ())
     ]
     if additional_lookups:
-        # Don't need to clone because the manager should have given us a fresh
+        # Don't need to clone because the queryset should have given us a fresh
         # instance, so we access an internal instead of using public interface
         # for performance reasons.
         rel_qs._prefetch_related_lookups = ()
@@ -2231,11 +2200,11 @@ def prefetch_one_level(instances, prefetcher, lookup, level):
             if as_attr:
                 setattr(obj, to_attr, vals)
             else:
-                manager = getattr(obj, to_attr)
+                queryset = getattr(obj, to_attr)
                 if leaf and lookup.queryset is not None:
-                    qs = manager._apply_rel_filters(lookup.queryset)
+                    qs = queryset._apply_rel_filters(lookup.queryset)
                 else:
-                    qs = manager.get_queryset()
+                    qs = queryset.__class__(model=queryset.model)
                 qs._result_cache = vals
                 # We don't want the individual qs doing prefetch_related now,
                 # since we have merged this into the current work.

plain/models/query_utils.py

@@ -361,7 +361,7 @@ def check_rel_lookup_compatibility(model, target_opts, field):
     # model is ok, too. Consider the case:
     # class Restaurant(models.Model):
     #     place = OneToOneField(Place, primary_key=True):
-    # Restaurant.objects.filter(id__in=Restaurant.objects.all()).
+    # Restaurant.query.filter(id__in=Restaurant.query.all()).
     # If we didn't have the primary key check, then id__in (== place__in) would
     # give Place's opts as the target opts, but Restaurant isn't compatible
     # with that. This logic applies only to primary keys, as when doing __in=qs,

plain/models/sql/compiler.py

@@ -98,20 +98,20 @@ class SQLCompiler:
         then it is correct".
         """
         # Some examples:
-        #     SomeModel.objects.annotate(Count('somecol'))
+        #     SomeModel.query.annotate(Count('somecol'))
         #     GROUP BY: all fields of the model
         #
-        #    SomeModel.objects.values('name').annotate(Count('somecol'))
+        #    SomeModel.query.values('name').annotate(Count('somecol'))
         #    GROUP BY: name
         #
-        #    SomeModel.objects.annotate(Count('somecol')).values('name')
+        #    SomeModel.query.annotate(Count('somecol')).values('name')
         #    GROUP BY: all cols of the model
         #
-        #    SomeModel.objects.values('name', 'id')
+        #    SomeModel.query.values('name', 'id')
         #    .annotate(Count('somecol')).values('id')
         #    GROUP BY: name, id
         #
-        #    SomeModel.objects.values('name').annotate(Count('somecol')).values('id')
+        #    SomeModel.query.values('name').annotate(Count('somecol')).values('id')
         #    GROUP BY: name, id
         #
         # In fact, the self.query.group_by is the minimal set to GROUP BY. It

plain/models/sql/query.py

@@ -1174,9 +1174,9 @@ class Query(BaseExpression):
         """Check the type of object passed to query relations."""
         if field.is_relation:
             # Check that the field and the queryset use the same model in a
-            # query like .filter(author=Author.objects.all()). For example, the
+            # query like .filter(author=Author.query.all()). For example, the
             # opts would be Author's (from the author field) and value.model
-            # would be Author.objects.all() queryset's .model (Author also).
+            # would be Author.query.all() queryset's .model (Author also).
             # The field is the related field on the lhs side.
             if (
                 isinstance(value, Query)

{plain_models-0.41.1.dist-info → plain_models-0.43.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.models
-Version: 0.41.1
+Version: 0.43.0
 Summary: Model your data and store it in a database.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 - [Fields](#fields)
 - [Validation](#validation)
 - [Indexes and constraints](#indexes-and-constraints)
-- [Managers](#managers)
+- [Custom QuerySets](#custom-querysets)
 - [Forms](#forms)
 - [Sharing fields across models](#sharing-fields-across-models)
 - [Installation](#installation)
@@ -54,7 +54,7 @@ from .models import User
 
 
 # Create a new user
-user = User.objects.create(
+user = User.query.create(
     email="test@example.com",
     password="password",
 )
@@ -67,7 +67,7 @@ user.save()
 user.delete()
 
 # Query for users
-admin_users = User.objects.filter(is_admin=True)
+admin_users = User.query.filter(is_admin=True)
 ```
 
 ## Database connection
@@ -96,30 +96,30 @@ Multiple backends are supported, including Postgres, MySQL, and SQLite.
 
 ## Querying
 
-Models come with a powerful query API through their [`Manager`](./manager.py#Manager) interface:
+Models come with a powerful query API through their [`QuerySet`](./query.py#QuerySet) interface:
 
 ```python
 # Get all users
-all_users = User.objects.all()
+all_users = User.query.all()
 
 # Filter users
-admin_users = User.objects.filter(is_admin=True)
-recent_users = User.objects.filter(created_at__gte=datetime.now() - timedelta(days=7))
+admin_users = User.query.filter(is_admin=True)
+recent_users = User.query.filter(created_at__gte=datetime.now() - timedelta(days=7))
 
 # Get a single user
-user = User.objects.get(email="test@example.com")
+user = User.query.get(email="test@example.com")
 
 # Complex queries with Q objects
 from plain.models import Q
-users = User.objects.filter(
+users = User.query.filter(
     Q(is_admin=True) | Q(email__endswith="@example.com")
 )
 
 # Ordering
-users = User.objects.order_by("-created_at")
+users = User.query.order_by("-created_at")
 
 # Limiting results
-first_10_users = User.objects.all()[:10]
+first_10_users = User.query.all()[:10]
 ```
 
 For more advanced querying options, see the [`QuerySet`](./query.py#QuerySet) class.
@@ -222,28 +222,71 @@ class User(models.Model):
         ]
 ```
 
-## Managers
+## Custom QuerySets
 
-[`Manager`](./manager.py#Manager) objects provide the interface for querying models:
+With the Manager functionality now merged into QuerySet, you can customize [`QuerySet`](./query.py#QuerySet) classes to provide specialized query methods. There are several ways to use custom QuerySets:
+
+### Setting a default QuerySet for a model
+
+Use `Meta.queryset_class` to set a custom QuerySet that will be used by `Model.query`:
+
+```python
+class PublishedQuerySet(models.QuerySet):
+    def published_only(self):
+        return self.filter(status="published")
+
+    def draft_only(self):
+        return self.filter(status="draft")
+
+@models.register_model
+class Article(models.Model):
+    title = models.CharField(max_length=200)
+    status = models.CharField(max_length=20)
+
+    class Meta:
+        queryset_class = PublishedQuerySet
+
+# Usage - all methods available on Article.objects
+all_articles = Article.query.all()
+published_articles = Article.query.published_only()
+draft_articles = Article.query.draft_only()
+```
+
+### Using custom QuerySets without formal attachment
+
+You can also use custom QuerySets manually without setting them as the default:
 
 ```python
-class PublishedManager(models.Manager):
-    def get_queryset(self):
-        return super().get_queryset().filter(status="published")
+class SpecialQuerySet(models.QuerySet):
+    def special_filter(self):
+        return self.filter(special=True)
 
+# Create and use the QuerySet manually
+special_qs = SpecialQuerySet(model=Article)
+special_articles = special_qs.special_filter()
+```
+
+### Using classmethods for convenience
+
+For even cleaner API, add classmethods to your model:
+
+```python
+@models.register_model
 class Article(models.Model):
     title = models.CharField(max_length=200)
     status = models.CharField(max_length=20)
 
-    # Default manager
-    objects = models.Manager()
+    @classmethod
+    def published(cls):
+        return PublishedQuerySet(model=cls).published_only()
 
-    # Custom manager
-    published = PublishedManager()
+    @classmethod
+    def drafts(cls):
+        return PublishedQuerySet(model=cls).draft_only()
 
 # Usage
-all_articles = Article.objects.all()
-published_articles = Article.published.all()
+published_articles = Article.published()
+draft_articles = Article.drafts()
 ```
 
 ## Forms

{plain_models-0.41.1.dist-info → plain_models-0.43.0.dist-info}/RECORD

@@ -1,31 +1,30 @@
 plain/models/AGENTS.md,sha256=xQQW-z-DehnCUyjiGSBfLqUjoSUdo_W1b0JmwYmWieA,209
-plain/models/CHANGELOG.md,sha256=NMKkqzD7d6x3kmJzOL0-3qHGjBlFur1pX39ZR7w2i4Y,11169
-plain/models/README.md,sha256=uibhtLwH-JUGzpW3tCFUrQo19i2RAvet1EkpyItdFxM,7269
-plain/models/__init__.py,sha256=LJhlJauhTfUySY2hTJ9qBhCbEKMxTDKpeVrjYXZnsCw,2964
+plain/models/CHANGELOG.md,sha256=yPHtgiBY7hwtydus3mAiT945vgMTO5c9pF64KC9V37s,14530
+plain/models/README.md,sha256=lqzWJrEIxBCHC1P8X1YoRjbsMFlu0-kG4ujP76B_ZO4,8572
+plain/models/__init__.py,sha256=aB9HhIKBh0iK3LZztInAE-rDF-yKsdfcjfMtwtN5vnI,2920
 plain/models/aggregates.py,sha256=P0mhsMl1VZt2CVHMuCHnNI8SxZ9citjDLEgioN6NOpo,7240
-plain/models/base.py,sha256=FJlWJ_LUdjk3Bizi45R4IsYzcuLAoiUHS-R3FxxNmWk,66857
-plain/models/cli.py,sha256=f6VF49l4wWtPn8feTF6IL6qIrcYxk3x9nTf03BOWSp4,36564
+plain/models/base.py,sha256=Yp08EC4I0wQ65AXGNUe3mgM01zmuJ6B6XfFyCkcsmEc,66161
+plain/models/cli.py,sha256=lhvlw7DVOU3CVoMUpHaj7qIbQ2d6qtSm_l9PdCeCnc0,36404
 plain/models/config.py,sha256=OF7eIEtXNZyGwgc3eMEpb5uEAup5RXeT-0um60dfBeU,636
 plain/models/connections.py,sha256=RBNa2FZ0x3C9un6PaYL-IYzH_OesRSpdHNGKvYHGiOM,2276
 plain/models/constants.py,sha256=ndnj9TOTKW0p4YcIPLOLEbsH6mOgFi6B1-rIzr_iwwU,210
-plain/models/constraints.py,sha256=EoJ4kuV_7f-VDiOVMHrAybr6uTDblNykTg0YCtgOboo,16760
+plain/models/constraints.py,sha256=Mm9gm5D7EKmo486dL481-hrTcxi2gxgqyUUtbGrkLjs,16749
 plain/models/database_url.py,sha256=iidKVhOylf5N6t1EMPRySRQiv6LiuRjYRECB_UJ3MI8,6419
 plain/models/db.py,sha256=FpdfLYrRX2THUzDy4QdJ_OpSo9IFKLerZIEQ-T2x8zA,1348
 plain/models/default_settings.py,sha256=cDym1o_DtHySWgDRIdjgEM0YxjgYU51ZqzWVA3vpzTk,569
-plain/models/deletion.py,sha256=_S38TDd0TbsVKvmhutpeoZZt2AeA-4HFDpJweVFzaAM,17601
+plain/models/deletion.py,sha256=3eW3bb39NbIlIAp4ZAEtSZuiy9oH4i5e83OK_8oIaxI,17607
 plain/models/entrypoints.py,sha256=EC14mW19tK9dCumaNHnv4_9jQV8jomQ8jXy8Ib89VBw,191
 plain/models/enums.py,sha256=Zr-JKt2aeYsSADtAm69fDRfajS7jYwop2vWQVLJ9YYI,2726
 plain/models/exceptions.py,sha256=IqzK60-hY3TYsgOMxlWwgpVa21E7ydC-gqUG4tNvVJc,2042
 plain/models/expressions.py,sha256=hN6sfOxqxpP0qmYOUotsFAAn2-bnl35iHwyINyXA7CI,62763
-plain/models/forms.py,sha256=FUBgt1P-4JmSQeigdITYqZPYqDI89XZQfPtdr8ffgsc,25816
+plain/models/forms.py,sha256=VreclYMITYh3D-sfZV3iSQH9QjNmwNwIYQL_90owOVM,25805
 plain/models/indexes.py,sha256=fazIZPJgCX5_Bhwk7MQy3YbWOxpHvaCe1dDLGGldTuY,11540
 plain/models/lookups.py,sha256=eCsxQXUcOoAa_U_fAAd3edcgXI1wfyFW8hPgUh8TwTo,24776
-plain/models/manager.py,sha256=zc2W-vTTk3zkDXCds5-TCXgLhVmM4PdQb-qtu-njeLQ,5827
-plain/models/options.py,sha256=1EtFAXG3RqwoT8DzRKUmZvfXlhk98MvCf4q4FG6jBN4,23572
+plain/models/options.py,sha256=BOnu9NDVcgL0tJhan5gBbaK1SWNeg4NVTPNAzkKT3NE,21528
 plain/models/otel.py,sha256=36QSJS6UXv1YPJTqeSmEvdMVHRkXa_zgqqItJaXc59g,7619
 plain/models/preflight.py,sha256=PlS1S2YHEpSKZ57KbTP6TbED98dDDXYSBUk6xMIpgsI,8136
-plain/models/query.py,sha256=i9wDYzi3hjlLSjUih3yykwERLZT23m1gZ56jqmZth7Y,90520
-plain/models/query_utils.py,sha256=Ny7PZJ5GduDrdzAT2ALtcKge780QP3w-ARTBqHNOu6U,14178
+plain/models/query.py,sha256=6t0ow7oQfVB6WiC3fQ3kLme8TBeSOscEt5xl2lu6oOQ,89703
+plain/models/query_utils.py,sha256=zxAdfwDbOmaN_SJODl4Wl9gs-q2EzOjXbsBFTWWhh8g,14174
 plain/models/registry.py,sha256=5yxVgT_W8GlyL2bsGT2HvMQB5sKolXucP2qrhr7Wlnk,8126
 plain/models/transaction.py,sha256=KqkRDT6aqMgbPA_ch7qO8a9NyDvwY_2FaxM7FkBkcgY,9357
 plain/models/utils.py,sha256=rD47CAMH4SsznTe-kUnRUdnaZeZHVv1fwLUiU3KOFW0,1630
@@ -72,13 +71,14 @@ plain/models/backups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 plain/models/backups/cli.py,sha256=AKVh_Go0LxnxFi2jQjmpPEbbJvYCurjJsGCWESm1X8A,2960
 plain/models/backups/clients.py,sha256=WQ4X4KrkNeiKYJcpGRwnfRiAeeyduHWEnq4tA4mtjvw,4047
 plain/models/backups/core.py,sha256=09IZUhBEe1Yej3PC8AidtkaI0c8tt7VnqGBCWK-WrFg,3318
-plain/models/fields/__init__.py,sha256=PcricU7Z5qxIw-RIJhVZlMgHWWSJStJjuzU6l0P82uk,77949
+plain/models/fields/__init__.py,sha256=HrGTFOeG8Bt5pHWmiClmdn1qZcvCOIcXx4a5RKiIdr4,77938
 plain/models/fields/json.py,sha256=OdGW4EYBSHQgkuugB-EiIXOqGstUqcMKUvOTOVUHqEQ,18049
 plain/models/fields/mixins.py,sha256=K_ocrSbb6pPuGwYZeqgzoZskwCIMFIB6IV3T5CrU5J0,1805
-plain/models/fields/related.py,sha256=7Zbpz17zzmMwg9jBQhwPH-dyAW01ClaQGJMMwbArWCM,51027
-plain/models/fields/related_descriptors.py,sha256=VRWNdR4ptXwxQ0jyBajPV9h2Gv5jc5lzBDl9XZgT4Xk,39094
-plain/models/fields/related_lookups.py,sha256=rtDTS-GvN4goka7CP36dMg1ayUyOEAE39VKXyRMV5g0,7785
-plain/models/fields/reverse_related.py,sha256=AqHPSx1tZ6uj9rESyy1tN1qT415N7eifkgKZHJZWH2k,10767
+plain/models/fields/related.py,sha256=W5pvb_J0AulyQmd-q8Vzh4b9GT7IDmeAaJNCZhsMqkw,49698
+plain/models/fields/related_descriptors.py,sha256=nsVgLjpOlrha90eTfg7ad_il6_uI_YG0d4bH51LP3Os,15180
+plain/models/fields/related_lookups.py,sha256=9y6AfEcg8xRRZne2LXFP6jym9mecFlB_toYih7lD8Uw,7781
+plain/models/fields/related_managers.py,sha256=XiV2IvuEFLEWnej2KokCu6HFx87UyZTqqsP74v2xIHw,25011
+plain/models/fields/reverse_related.py,sha256=SNFytCI3BeAlB5kY6UQrv6QGqtRMo_aHWPx_-fCkfu4,10404
 plain/models/functions/__init__.py,sha256=aglCm_JtzDYk2KmxubDN_78CGG3JCfRWnfJ74Oj5YJ4,2658
 plain/models/functions/comparison.py,sha256=9uAiEuNXZiGFzJKBvktsHwx58Qpa2cPQkr6pUWsGcKo,6554
 plain/models/functions/datetime.py,sha256=ov1H0Oq9qHSeu8L5CZsln0_SMU2C5M_P5HvKxppA24o,13089
@@ -87,7 +87,7 @@ plain/models/functions/mixins.py,sha256=s6H0Ejugo8707EnxN6zS4givmTbPrFuk3Q_mqCGQ
 plain/models/functions/text.py,sha256=Vn4Rh-cVJCL4NUaBcj72cwHa6yHap5ql0XPwn0-K_tc,8908
 plain/models/functions/window.py,sha256=3S0QIZc_pIVcWpE5Qq-OxixmtATLb8rZrWkvCfVtJ7Q,2809
 plain/models/migrations/__init__.py,sha256=ZAQUGrfr_OxYMIO7vUBIHLs_M3oZ4iQSjDzCHRFUdtI,96
-plain/models/migrations/autodetector.py,sha256=8GpvNHdtTshKB05YiP2AWy4Vw5a2ClAm0peA4K7_-WE,61780
+plain/models/migrations/autodetector.py,sha256=MuJEVaU9IZ8c6HfcDsEANNujUrSGMN-iDd5WDPM7ht8,60957
 plain/models/migrations/exceptions.py,sha256=_bGjIMaBP2Py9ePUxUhiH0p1zXrQM4JhJO4lWfyF8-g,1044
 plain/models/migrations/executor.py,sha256=2_1bWM7Dp3s8z6PADAEN-Y0KnIiRzAqsUkn_nRQl5TA,6757
 plain/models/migrations/graph.py,sha256=nrztu_8dU0wAUSxKUqqFWpvZcSQxGEqE6dXWkPytmCU,12570
@@ -95,28 +95,28 @@ plain/models/migrations/loader.py,sha256=qUTmaEYI1_mV6goQPQYZKjSz8rMbE6G1wqvrAsm
 plain/models/migrations/migration.py,sha256=22YwRHnaRnCkBpW5p7K89tAU6h4QSsG5yiq-o7W-cSI,6505
 plain/models/migrations/optimizer.py,sha256=HH-uz-jnWw_Ni6F2_rRW1nax1Dxmf1s_F_8s8N2OlVc,3266
 plain/models/migrations/questioner.py,sha256=qAsePI5JHiSJrlY_kmpgMuK9Dom22q17edov7RtBeGw,11967
-plain/models/migrations/recorder.py,sha256=9UfNdzM5meeOXSxMNxTN69uqX0K2uh5Ma7dNA2fL2rI,3655
-plain/models/migrations/serializer.py,sha256=IRO1-8ojalOFt27DSfCDhRWjTULQZQ-aSroL-A9MPbk,12947
-plain/models/migrations/state.py,sha256=hlHp__1w-oVAeSfoZliaOBTxnjGL3C-C3iJF9_hXdjw,34484
+plain/models/migrations/recorder.py,sha256=_ncIVLJ4ns6AaO0vVmCoXfABlOFXDKu8NTPsutqKjK4,3653
+plain/models/migrations/serializer.py,sha256=yBP9TyUZlSh_8qdw1I4VotbsZqoomz3mBs7ASQLsDH8,12459
+plain/models/migrations/state.py,sha256=Q70cByjFgb8UG-wWqnLntf5s0hNv5DuDv0Bw1ovJ0yg,32116
 plain/models/migrations/utils.py,sha256=Ih_mu6UbdUSt-ZtHaB0xIXHDrBANuFZyftTQ56BFJYs,4174
 plain/models/migrations/writer.py,sha256=N8Rnjv5ccsA_CTcS7zZyppzyHFOUQVJy0l6RZYjwF-0,10981
-plain/models/migrations/operations/__init__.py,sha256=C8VTJbzvFgt7AXTPvtuY8HF1FC8rqNvsXMOCW26UV9E,802
+plain/models/migrations/operations/__init__.py,sha256=YKZsQsJ4G5iw9F4o6dOSgSCuLiiKuApvneoV4jqjZaA,752
 plain/models/migrations/operations/base.py,sha256=JsKGjM6ouvEbFHzV14km7YjkpOUC4PoUR1M2yGZ82bE,4323
 plain/models/migrations/operations/fields.py,sha256=ARL945rbztAnMsbd0lvQRsQJEmxYA3gDof0-4aOTeC4,11255
-plain/models/migrations/operations/models.py,sha256=kZc9zYK3Q3NyLV98oj-RYRyocIbFdt4QNyryOrQJAMM,26830
-plain/models/migrations/operations/special.py,sha256=SiL_7u3rSj35uhc8JPmFHtItt_k_EgbLhY-TEXfmkaI,5162
+plain/models/migrations/operations/models.py,sha256=jwhck8ygfi8cW8baVeGUB6coVVv4HnGVSFVb2IW_aTU,24947
+plain/models/migrations/operations/special.py,sha256=cKieE9AQcFrpvEw5_TJCum56uu6cfN1p-azY7sKdB7E,4944
 plain/models/sql/__init__.py,sha256=FoRCcab-kh_XY8C4eldgLy9-zuk-M63Nyi9cFsYjclU,225
-plain/models/sql/compiler.py,sha256=UzqJljjKfjidz8TW0tr8CucLF2Y0xmdsW9Rpnm_1Sc4,84701
+plain/models/sql/compiler.py,sha256=FVa_v4Q8izuFc9VQTrW4jAqM1uqRnTVdOeP7IKt3yM8,84691
 plain/models/sql/constants.py,sha256=usb1LSh9WNGPsurWAGppDkV0wYJJg5GEegKibQdS718,533
 plain/models/sql/datastructures.py,sha256=FC88CVCukLyU621JrmKLBhmgvotEHgAhIOYfVvJpuR0,7084
-plain/models/sql/query.py,sha256=_CiouANls_2qgDxvftKXOzhsOx9FWhUJ5j2rE2-PGm0,108749
+plain/models/sql/query.py,sha256=ASR6jeRTjGlnO5E_hb5cnUYQH2_JrpHa_M545xOG7dg,108745
 plain/models/sql/subqueries.py,sha256=1YYlgoDrx_mW19MWWawLdgDTJnLgvvkGBQ30YQ702W4,5860
 plain/models/sql/where.py,sha256=ezE9Clt2BmKo-I7ARsgqZ_aVA-1UdayCwr6ULSWZL6c,12635
 plain/models/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plain/models/test/pytest.py,sha256=KD5-mxonBxOYIhUh9Ql5uJOIiC9R4t-LYfb6sjA0UdE,3486
 plain/models/test/utils.py,sha256=S3d6zf3OFWDxB_kBJr0tDvwn51bjwDVWKPumv37N-p8,467
-plain_models-0.41.1.dist-info/METADATA,sha256=enNWwlsqHqqrPDy5uzkFcxfT4bcRO4lYKMjN7W7M6hI,7581
-plain_models-0.41.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_models-0.41.1.dist-info/entry_points.txt,sha256=IYJAW9MpL3PXyXFWmKmALagAGXC_5rzBn2eEGJlcV04,112
-plain_models-0.41.1.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain_models-0.41.1.dist-info/RECORD,,
+plain_models-0.43.0.dist-info/METADATA,sha256=1lUO79n5x4G0s1FzZinEIm5izVs3R-ii1NOR8ecaHvA,8884
+plain_models-0.43.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_models-0.43.0.dist-info/entry_points.txt,sha256=IYJAW9MpL3PXyXFWmKmALagAGXC_5rzBn2eEGJlcV04,112
+plain_models-0.43.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain_models-0.43.0.dist-info/RECORD,,

plain/models/manager.py

@@ -1,176 +0,0 @@
-import inspect
-from functools import wraps
-from importlib import import_module
-
-from plain.models.query import QuerySet
-
-
-class BaseManager:
-    # To retain order, track each time a Manager instance is created.
-    creation_counter = 0
-
-    # Set to True for the 'objects' managers that are automatically created.
-    auto_created = False
-
-    #: If set to True the manager will be serialized into migrations and will
-    #: thus be available in e.g. RunPython operations.
-    use_in_migrations = False
-
-    def __new__(cls, *args, **kwargs):
-        # Capture the arguments to make returning them trivial.
-        obj = super().__new__(cls)
-        obj._constructor_args = (args, kwargs)
-        return obj
-
-    def __init__(self):
-        super().__init__()
-        self._set_creation_counter()
-        self.model = None
-        self.name = None
-        self._hints = {}
-
-    def __str__(self):
-        """Return "package_label.model_label.manager_name"."""
-        return f"{self.model._meta.label}.{self.name}"
-
-    def __class_getitem__(cls, *args, **kwargs):
-        return cls
-
-    def deconstruct(self):
-        """
-        Return a 5-tuple of the form (as_manager (True), manager_class,
-        queryset_class, args, kwargs).
-
-        Raise a ValueError if the manager is dynamically generated.
-        """
-        qs_class = self._queryset_class
-        if getattr(self, "_built_with_as_manager", False):
-            # using MyQuerySet.as_manager()
-            return (
-                True,  # as_manager
-                None,  # manager_class
-                f"{qs_class.__module__}.{qs_class.__name__}",  # qs_class
-                None,  # args
-                None,  # kwargs
-            )
-        else:
-            module_name = self.__module__
-            name = self.__class__.__name__
-            # Make sure it's actually there and not an inner class
-            module = import_module(module_name)
-            if not hasattr(module, name):
-                raise ValueError(
-                    f"Could not find manager {name} in {module_name}.\n"
-                    "Please note that you need to inherit from managers you "
-                    "dynamically generated with 'from_queryset()'."
-                )
-            return (
-                False,  # as_manager
-                f"{module_name}.{name}",  # manager_class
-                None,  # qs_class
-                self._constructor_args[0],  # args
-                self._constructor_args[1],  # kwargs
-            )
-
-    def check(self, **kwargs):
-        return []
-
-    @classmethod
-    def _get_queryset_methods(cls, queryset_class):
-        def create_method(name, method):
-            @wraps(method)
-            def manager_method(self, *args, **kwargs):
-                return getattr(self.get_queryset(), name)(*args, **kwargs)
-
-            return manager_method
-
-        new_methods = {}
-        for name, method in inspect.getmembers(
-            queryset_class, predicate=inspect.isfunction
-        ):
-            # Only copy missing methods.
-            if hasattr(cls, name):
-                continue
-            # Only copy public methods or methods with the attribute
-            # queryset_only=False.
-            queryset_only = getattr(method, "queryset_only", None)
-            if queryset_only or (queryset_only is None and name.startswith("_")):
-                continue
-            # Copy the method onto the manager.
-            new_methods[name] = create_method(name, method)
-        return new_methods
-
-    @classmethod
-    def from_queryset(cls, queryset_class, class_name=None):
-        if class_name is None:
-            class_name = f"{cls.__name__}From{queryset_class.__name__}"
-        return type(
-            class_name,
-            (cls,),
-            {
-                "_queryset_class": queryset_class,
-                **cls._get_queryset_methods(queryset_class),
-            },
-        )
-
-    def contribute_to_class(self, cls, name):
-        self.name = self.name or name
-        self.model = cls
-
-        setattr(cls, name, ManagerDescriptor(self))
-
-        cls._meta.add_manager(self)
-
-    def _set_creation_counter(self):
-        """
-        Set the creation counter value for this instance and increment the
-        class-level copy.
-        """
-        self.creation_counter = BaseManager.creation_counter
-        BaseManager.creation_counter += 1
-
-    #######################
-    # PROXIES TO QUERYSET #
-    #######################
-
-    def get_queryset(self):
-        """
-        Return a new QuerySet object. Subclasses can override this method to
-        customize the behavior of the Manager.
-        """
-        return self._queryset_class(model=self.model, hints=self._hints)
-
-    def all(self):
-        # We can't proxy this method through the `QuerySet` like we do for the
-        # rest of the `QuerySet` methods. This is because `QuerySet.all()`
-        # works by creating a "copy" of the current queryset and in making said
-        # copy, all the cached `prefetch_related` lookups are lost. See the
-        # implementation of `RelatedManager.get_queryset()` for a better
-        # understanding of how this comes into play.
-        return self.get_queryset()
-
-    def __eq__(self, other):
-        return (
-            isinstance(other, self.__class__)
-            and self._constructor_args == other._constructor_args
-        )
-
-    def __hash__(self):
-        return id(self)
-
-
-class Manager(BaseManager.from_queryset(QuerySet)):
-    pass
-
-
-class ManagerDescriptor:
-    def __init__(self, manager):
-        self.manager = manager
-
-    def __get__(self, instance, cls=None):
-        if instance is not None:
-            raise AttributeError(
-                f"Manager isn't accessible via {cls.__name__} instances"
-            )
-
-        return cls._meta.managers_map[self.manager.name]