Author: adrian
Date: 2006-07-10 23:11:40 -0500 (Mon, 10 Jul 2006)
New Revision: 3327
Modified:
django/trunk/django/db/models/query.py
Log:
Added local 'qn' variable for backend.quote_name in
django.db.models.query.delete_objects
Modified: django/trunk/django/db/models/query.py
===================================================================
--- django/trunk/django/db/models/query.py 2006-07-11 03:35:17 UTC (rev
3326)
+++ django/trunk/django/db/models/query.py 2006-07-11 04:11:40 UTC (rev
3327)
@@ -909,6 +909,7 @@
def delete_objects(seen_objs):
"Iterate through a list of seen classes, and remove any instances that are
referred to"
+ qn = backend.quote_name
ordered_classes = seen_objs.keys()
ordered_classes.reverse()
@@ -926,24 +927,21 @@
for related in cls._meta.get_all_related_many_to_many_objects():
for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
cursor.execute("DELETE FROM %s WHERE %s IN (%s)" % \
- (backend.quote_name(related.field.m2m_db_table()),
- backend.quote_name(related.field.m2m_reverse_name()),
+ (qn(related.field.m2m_db_table()),
+ qn(related.field.m2m_reverse_name()),
','.join(['%s' for pk in
pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]])),
pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE])
for f in cls._meta.many_to_many:
for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
cursor.execute("DELETE FROM %s WHERE %s IN (%s)" % \
- (backend.quote_name(f.m2m_db_table()),
- backend.quote_name(f.m2m_column_name()),
- ','.join(['%s' for pk in
pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]])),
+ (qn(f.m2m_db_table()), qn(f.m2m_column_name()),
+ ','.join(['%s' for pk in
pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]])),
pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE])
for field in cls._meta.fields:
if field.rel and field.null and field.rel.to in seen_objs:
for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
cursor.execute("UPDATE %s SET %s=NULL WHERE %s IN (%s)" % \
- (backend.quote_name(cls._meta.db_table),
- backend.quote_name(field.column),
- backend.quote_name(cls._meta.pk.column),
+ (qn(cls._meta.db_table), qn(field.column),
qn(cls._meta.pk.column),
','.join(['%s' for pk in
pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]])),
pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE])
@@ -953,9 +951,8 @@
pk_list = [pk for pk,instance in seen_objs[cls]]
for offset in range(0, len(pk_list), GET_ITERATOR_CHUNK_SIZE):
cursor.execute("DELETE FROM %s WHERE %s IN (%s)" % \
- (backend.quote_name(cls._meta.db_table),
- backend.quote_name(cls._meta.pk.column),
- ','.join(['%s' for pk in
pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]])),
+ (qn(cls._meta.db_table), qn(cls._meta.pk.column),
+ ','.join(['%s' for pk in
pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE]])),
pk_list[offset:offset+GET_ITERATOR_CHUNK_SIZE])
# Last cleanup; set NULLs where there once was a reference to the
object,
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates
-~----------~----~----~----~------~----~------~--~---
