Changeset 7474 for django/branches/queryset-refactor

Timestamp:

04/26/08 11:41:51 (7 months ago)

Author:

mtredinnick

Message:

queryset-refactor: Added a Model.from_sequence() constructor for internal and
advanced usage.

Files:

• django/branches/queryset-refactor/django/db/models/base.py (modified) (3 diffs)
• django/branches/queryset-refactor/django/db/models/query.py (modified) (2 diffs)

django/branches/queryset-refactor/django/db/models/base.py

@@ -165 +165 @@
-class Model(object):
-    __metaclass__ = ModelBase
-
-    def _get_pk_val(self, meta=None):
-        if not meta:
-            meta = self._meta
-        return getattr(self, meta.pk.attname)
-
-    def _set_pk_val(self, value):
-        return setattr(self, self._meta.pk.attname, value)
-
-    pk = property(_get_pk_val, _set_pk_val)
-
-    def __repr__(self):
-        return smart_str(u'<%s: %s>' % (self.__class__.__name__, unicode(self)))
-
-    def __str__(self):
-        if hasattr(self, '__unicode__'):
-            return force_unicode(self).encode('utf-8')
-        return '%s object' % self.__class__.__name__
-
-    def __eq__(self, other):
-        return isinstance(other, self.__class__) and self._get_pk_val() == other._get_pk_val()
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    def __hash__(self):
-        return hash(self._get_pk_val())
-
-    def __init__(self, *args, **kwargs):
@@ -265 +238 @@
-        dispatcher.send(signal=signals.post_init, sender=self.__class__, instance=self)
-
+    def from_sequence(cls, values):
+        """
+        An alternate class constructor, primarily for internal use.
+
+        Creates a model instance from a sequence of values (which corresponds
+        to all the non-many-to-many fields in creation order. If there are more
+        fields than values, the remaining (final) fields are given their
+        default values.
+
+        ForeignKey fields can only be initialised using id values, not
+        instances, in this method.
+        """
+        dispatcher.send(signal=signals.pre_init, sender=cls, args=values,
+                kwargs={})
+        obj = Empty()
+        obj.__class__ = cls
+        field_iter = iter(obj._meta.fields)
+        for val, field in izip(values, field_iter):
+            setattr(obj, field.attname, val)
+        for field in field_iter:
+            setattr(obj, field.attname, field.get_default())
+        dispatcher.send(signal=signals.post_init, sender=cls, instance=obj)
+        return obj
+
+    from_sequence = classmethod(from_sequence)
+
+    def __repr__(self):
+        return smart_str(u'<%s: %s>' % (self.__class__.__name__, unicode(self)))
+
+    def __str__(self):
+        if hasattr(self, '__unicode__'):
+            return force_unicode(self).encode('utf-8')
+        return '%s object' % self.__class__.__name__
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self._get_pk_val() == other._get_pk_val()
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __hash__(self):
+        return hash(self._get_pk_val())
+
+    def _get_pk_val(self, meta=None):
+        if not meta:
+            meta = self._meta
+        return getattr(self, meta.pk.attname)
+
+    def _set_pk_val(self, value):
+        return setattr(self, self._meta.pk.attname, value)
+
+    pk = property(_get_pk_val, _set_pk_val)
+
-    def save(self):
-        """
@@ -534 +560 @@
-########
-
+class Empty(object):
+    pass
+
-if sys.version_info < (2, 5):
-    # Prior to Python 2.5, Exception was an old-style class

django/branches/queryset-refactor/django/db/models/query.py

@@ -154 +154 @@
-                        max_depth, requested=requested)
-            else:
-(*
+.from_sequence(
-            for i, k in enumerate(extra_select):
-                setattr(obj, k, row[i])
@@ -647 +647 @@
-    restricted = requested is not None
-    index_end = index_start + len(klass._meta.fields)
-(*
+.from_sequence(
-    for f in klass._meta.fields:
-        if (not f.rel or (not restricted and f.null) or