Ticket #746: meta_models_2.patch

models/__init__.py

@@ -20 +20 @@
         # Add "get_thingie", "get_thingie_count" and "get_thingie_list" methods
         # for all related objects.
         for related in klass._meta.get_all_related_objects():
-            # Determine whether this related object is in another app.
-            # If it's in another app, the method names will have the app
-            # label prepended, and the add_BLAH() method will not be
-            # generated.
-            rel_mod = related.opts.get_model_module()
-            rel_obj_name = related.get_method_name_part()
-            if isinstance(related.field.rel, meta.OneToOne):
-                # Add "get_thingie" methods for one-to-one related objects.
-                # EXAMPLE: Place.get_restaurants_restaurant()
-                func = curry(meta.method_get_related, 'get_object', rel_mod, related.field)
-                func.__doc__ = "Returns the associated `%s.%s` object." % (related.opts.app_label, related.opts.module_name)
-                setattr(klass, 'get_%s' % rel_obj_name, func)
-            elif isinstance(related.field.rel, meta.ManyToOne):
-                # Add "get_thingie" methods for many-to-one related objects.
-                # EXAMPLE: Poll.get_choice()
-                func = curry(meta.method_get_related, 'get_object', rel_mod, related.field)
-                func.__doc__ = "Returns the associated `%s.%s` object matching the given criteria." % \
-                    (related.opts.app_label, related.opts.module_name)
-                setattr(klass, 'get_%s' % rel_obj_name, func)
-                # Add "get_thingie_count" methods for many-to-one related objects.
-                # EXAMPLE: Poll.get_choice_count()
-                func = curry(meta.method_get_related, 'get_count', rel_mod, related.field)
-                func.__doc__ = "Returns the number of associated `%s.%s` objects." % \
-                    (related.opts.app_label, related.opts.module_name)
-                setattr(klass, 'get_%s_count' % rel_obj_name, func)
-                # Add "get_thingie_list" methods for many-to-one related objects.
-                # EXAMPLE: Poll.get_choice_list()
-                func = curry(meta.method_get_related, 'get_list', rel_mod, related.field)
-                func.__doc__ = "Returns a list of associated `%s.%s` objects." % \
-                     (related.opts.app_label, related.opts.module_name)
-                setattr(klass, 'get_%s_list' % rel_obj_name, func)
-                # Add "add_thingie" methods for many-to-one related objects,
-                # but only for related objects that are in the same app.
-                # EXAMPLE: Poll.add_choice()
-                if related.opts.app_label == klass._meta.app_label:
-                    func = curry(meta.method_add_related, related.opts, rel_mod, related.field)
-                    func.alters_data = True
-                    setattr(klass, 'add_%s' % rel_obj_name, func)
-                del func
-            del rel_obj_name, rel_mod, related # clean up
+#            related.field.rel.setup_relationships( related, meta, klass)
+            related.field.setup_relationships( related, meta, klass)
+            del related # clean up
 
         # Do the same for all related many-to-many objects.
         for related in klass._meta.get_all_related_many_to_many_objects():
-            rel_mod = related.opts.get_model_module()
-            rel_obj_name = related.get_method_name_part()
-            setattr(klass, 'get_%s' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_object', klass._meta, rel_mod, related.field))
-            setattr(klass, 'get_%s_count' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_count', klass._meta, rel_mod, related.field))
-            setattr(klass, 'get_%s_list' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_list', klass._meta, rel_mod, related.field))
-            if related.opts.app_label == klass._meta.app_label:
-                func = curry(meta.method_set_related_many_to_many, related.opts, related.field)
-                func.alters_data = True
-                setattr(klass, 'set_%s' % related.opts.module_name, func)
-                del func
-            del rel_obj_name, rel_mod, related # clean up
+            related.field.setup_relationships( related, meta, klass)
+            del related # clean up
 
         # Add "set_thingie_order" and "get_thingie_order" methods for objects
         # that are ordered with respect to this.

core/meta/fields.py

@@ -704 +704 @@
                   return { self.name : choice_list[1][0] }
         return Field.flatten_data(self, follow, obj)
 
+    def setup_relationships(self, related, meta, klass):
+        " Add the 'get_thingie', 'get_thingie_count' and 'get_thingie_list' methods "
+        rel_mod = related.opts.get_model_module()
+        rel_obj_name = related.get_method_name_part()
+        # Add "get_thingie" methods for many-to-one related objects.
+        # EXAMPLE: Poll.get_choice()
+        func = curry(meta.method_get_related, 'get_object', rel_mod, self )
+        func.__doc__ = "Returns the associated `%s.%s` object matching the given criteria." % \
+            (related.opts.app_label, related.opts.module_name)
+        setattr(klass, 'get_%s' % rel_obj_name, func)
+        # Add "get_thingie_count" methods for many-to-one related objects.
+        # EXAMPLE: Poll.get_choice_count()
+        func = curry(meta.method_get_related, 'get_count', rel_mod, self )
+        func.__doc__ = "Returns the number of associated `%s.%s` objects." % \
+            (related.opts.app_label, related.opts.module_name)
+        setattr(klass, 'get_%s_count' % rel_obj_name, func)
+        # Add "get_thingie_list" methods for many-to-one related objects.
+        # EXAMPLE: Poll.get_choice_list()
+        func = curry(meta.method_get_related, 'get_list', rel_mod, self )
+        func.__doc__ = "Returns a list of associated `%s.%s` objects." % \
+             (related.opts.app_label, related.opts.module_name)
+        setattr(klass, 'get_%s_list' % rel_obj_name, func)
+        # Add "add_thingie" methods for many-to-one related objects,
+        # but only for related objects that are in the same app.
+        # EXAMPLE: Poll.add_choice()
+        if related.opts.app_label == klass._meta.app_label:
+            func = curry(meta.method_add_related, related.opts, rel_mod, self )
+            func.alters_data = True
+            setattr(klass, 'add_%s' % rel_obj_name, func)
+        del func, rel_obj_name, rel_mod # clean up
+
+
 class ManyToManyField(Field):
     def __init__(self, to, **kwargs):
         kwargs['verbose_name'] = kwargs.get('verbose_name', to._meta.verbose_name_plural)
@@ -765 +797 @@
                    new_data[self.name] = [choices_list[0][0]]
         return new_data
 
+    def setup_relationships(self, related, meta, klass):
+        " Add 'get_thingie', 'get_thingie_count' and 'get_thingie_list' methods"
+        rel_mod = related.opts.get_model_module()
+        rel_obj_name = related.get_method_name_part()
+        setattr(klass, 'get_%s' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_object', klass._meta, rel_mod, self))
+        setattr(klass, 'get_%s_count' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_count', klass._meta, rel_mod, self))
+        setattr(klass, 'get_%s_list' % rel_obj_name, curry(meta.method_get_related_many_to_many, 'get_list', klass._meta, rel_mod, self))
+        if related.opts.app_label == klass._meta.app_label:
+            func = curry(meta.method_set_related_many_to_many, related.opts, self)
+            func.alters_data = True
+            setattr(klass, 'set_%s' % related.opts.module_name, func)
+            del func
+
+        del rel_obj_name, rel_mod # clean up
+
+
 class OneToOneField(IntegerField):
     def __init__(self, to, to_field=None, **kwargs):
         kwargs['verbose_name'] = kwargs.get('verbose_name', 'ID')
@@ -785 +833 @@
         kwargs['primary_key'] = True
         IntegerField.__init__(self, **kwargs)
 
+    def setup_relationships(self, related, meta, klass):
+        " Add the 'get_thingie' "
+        rel_mod = related.opts.get_model_module()
+        rel_obj_name = related.get_method_name_part()
+        # Add "get_thingie" methods for one-to-one related objects.
+        # EXAMPLE: Place.get_restaurants_restaurant()
+        func = curry(meta.method_get_related, 'get_object', rel_mod, self)
+        func.__doc__ = "Returns the associated `%s.%s` object." % (related.opts.app_label, related.opts.module_name)
+        setattr(klass, 'get_%s' % rel_obj_name, func)
+
+        del func, rel_obj_name, rel_mod # clean up
+
+
 class ManyToOne:
     def __init__(self, to, field_name, num_in_admin=3, min_num_in_admin=None,
         max_num_in_admin=None, num_extra_on_change=1, edit_inline=False,
@@ -806 +867 @@
         "Returns the Field in the 'to' object to which this relationship is tied."
         return self.to.get_field(self.field_name)
 
+
 class ManyToMany:
     def __init__(self, to, singular=None, num_in_admin=0, related_name=None,
         filter_interface=None, limit_choices_to=None, raw_id_admin=False):
@@ -830 +892 @@
         self.lookup_overrides = lookup_overrides or {}
         self.raw_id_admin = raw_id_admin
 
+
 class BoundFieldLine(object):
     def __init__(self, field_line, field_mapping, original, bound_field_class=BoundField):
         self.bound_fields = [field.bind(field_mapping, original, bound_field_class)