p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

magic-removal: Fixed a couple of bugs 

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-12-12 03:47:34 +00:00
parent 24cf934578
commit 82920f423d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/core/meta/__init__.py
View File

@ -1288,7 +1288,7 @@ class Manager:
raise StopIteration raise StopIteration
for row in rows: for row in rows:
if fill_cache: if fill_cache:
obj, index_end = _get_cached_row(opts, row, 0) obj, index_end = _get_cached_row(self.klass._meta, row, 0)
else: else:
obj = self.klass(*row[:index_end]) obj = self.klass(*row[:index_end])
for i, k in enumerate(kwargs['select']): for i, k in enumerate(kwargs['select']):
@ -1391,7 +1391,7 @@ def method_get_related(method_name, rel_mod, rel_field, self, **kwargs):
else: else:
kwargs['%s__%s__exact' % (rel_field.name, rel_field.rel.to._meta.pk.name)] = getattr(self, rel_field.rel.get_related_field().attname) kwargs['%s__%s__exact' % (rel_field.name, rel_field.rel.to._meta.pk.name)] = getattr(self, rel_field.rel.get_related_field().attname)
kwargs.update(rel_field.rel.lookup_overrides) kwargs.update(rel_field.rel.lookup_overrides)
return getattr(rel_mod, method_name)(**kwargs) return getattr(rel_mod.Klass.objects, method_name)(**kwargs)
# Handles adding related objects. # Handles adding related objects.
# Example: Poll.add_choice() # Example: Poll.add_choice()
@ -1410,7 +1410,7 @@ def method_add_related(rel_obj, rel_mod, rel_field, self, *args, **kwargs):
# Examples: Album.get_song(), Album.get_song_list(), Album.get_song_count() # Examples: Album.get_song(), Album.get_song_list(), Album.get_song_count()
def method_get_related_many_to_many(method_name, opts, rel_mod, rel_field, self, **kwargs): def method_get_related_many_to_many(method_name, opts, rel_mod, rel_field, self, **kwargs):
kwargs['%s__%s__exact' % (rel_field.name, opts.pk.name)] = getattr(self, opts.pk.attname) kwargs['%s__%s__exact' % (rel_field.name, opts.pk.name)] = getattr(self, opts.pk.attname)
return getattr(rel_mod, method_name)(**kwargs) return getattr(rel_mod.Klass.objects, method_name)(**kwargs)
# Handles setting many-to-many related objects. # Handles setting many-to-many related objects.
# Example: Album.set_songs() # Example: Album.set_songs()
@ -1486,7 +1486,7 @@ def _get_cached_row(opts, row, index_start):
obj = opts.get_model_module().Klass(*row[index_start:index_end]) obj = opts.get_model_module().Klass(*row[index_start:index_end])
for f in opts.fields: for f in opts.fields:
if f.rel and not f.null: if f.rel and not f.null:
rel_obj, index_end = _get_cached_row(f.rel.to, row, index_end) rel_obj, index_end = _get_cached_row(f.rel.to._meta, row, index_end)
setattr(obj, f.get_cache_name(), rel_obj) setattr(obj, f.get_cache_name(), rel_obj)
return obj, index_end return obj, index_end
@ -1509,7 +1509,7 @@ def _fill_table_cache(opts, select, tables, where, old_prefix, cache_tables_seen
(db.db.quote_name(old_prefix), db.db.quote_name(f.column), (db.db.quote_name(old_prefix), db.db.quote_name(f.column),
db.db.quote_name(db_table), db.db.quote_name(f.rel.get_related_field().column))) db.db.quote_name(db_table), db.db.quote_name(f.rel.get_related_field().column)))
select.extend(['%s.%s' % (db.db.quote_name(db_table), db.db.quote_name(f2.column)) for f2 in f.rel.to._meta.fields]) select.extend(['%s.%s' % (db.db.quote_name(db_table), db.db.quote_name(f2.column)) for f2 in f.rel.to._meta.fields])
_fill_table_cache(f.rel.to, select, tables, where, db_table, cache_tables_seen) _fill_table_cache(f.rel.to._meta, select, tables, where, db_table, cache_tables_seen)
def _throw_bad_kwarg_error(kwarg): def _throw_bad_kwarg_error(kwarg):
# Helper function to remove redundancy. # Helper function to remove redundancy.