Ticket #2227: django-20060703-nested_transactions.diff

django/db/transaction.py

@@ -187 +187 @@
     control in web apps.
     """
     def _commit_on_success(*args, **kw):
-        try:
-            enter_transaction_management()
-            managed(True)
+        # only use transactions if we don't have already an ongoing transaction
+        thread_ident = thread.get_ident()
+        if thread_ident not in state or state[thread_ident] == []:
             try:
-                res = func(*args, **kw)
-            except Exception, e:
-                if is_dirty():
-                    rollback()
-                raise
-            else:
-                if is_dirty():
-                    commit()
-            return res
-        finally:
-            leave_transaction_management()
+                enter_transaction_management()
+                managed(True)
+                try:
+                    res = func(*args, **kw)
+                except Exception, e:
+                    if is_dirty():
+                        rollback()
+                    raise
+                else:
+                    if is_dirty():
+                        commit()
+                return res
+            finally:
+                leave_transaction_management()
+        else:
+            return func(*args, **kw)
     return _commit_on_success
 
 def commit_manually(func):

django/core/management.py

@@ -286 +286 @@
     for klass in app_models:
         if cursor and klass._meta.db_table in table_names:
             # Drop the table now
-            output.append('%s %s;' % (style.SQL_KEYWORD('DROP TABLE'),
-                style.SQL_TABLE(backend.quote_name(klass._meta.db_table))))
             if backend.supports_constraints and references_to_delete.has_key(klass):
                 for rel_class, f in references_to_delete[klass]:
                     table = rel_class._meta.db_table
@@ -300 +298 @@
                         style.SQL_KEYWORD(backend.get_drop_foreignkey_sql()),
                         style.SQL_FIELD(backend.quote_name("%s_referencing_%s_%s" % (col, r_table, r_col)))))
                 del references_to_delete[klass]
+            output.append('%s %s;' % (style.SQL_KEYWORD('DROP TABLE'),
+                style.SQL_TABLE(backend.quote_name(klass._meta.db_table))))
 
     # Output DROP TABLE statements for many-to-many tables.
     for klass in app_models:

django/contrib/comments/views/comments.py

@@ -252 +252 @@
         else:
             manipulator.do_html2python(new_data)
             comment = manipulator.save(new_data)
-        return HttpResponseRedirect("../posted/?c=%s:%s" % (content_type_id, object_id))
+        return HttpResponseRedirect("../posted/?c=%s:%s&ic=%s" % (content_type_id, object_id, comment.id))
     else:
         raise Http404, _("The comment form didn't provide either 'preview' or 'post'")
 
@@ -316 +316 @@
         else:
             manipulator.do_html2python(new_data)
             comment = manipulator.save(new_data)
-        return HttpResponseRedirect("../posted/?c=%s:%s" % (content_type_id, object_id))
+        return HttpResponseRedirect("../posted/?c=%s:%s&if=%s" % (content_type_id, object_id, comment.id))
     else:
         raise Http404, _("The comment form didn't provide either 'preview' or 'post'")
 
@@ -330 +330 @@
             The object the comment was posted on
     """
     obj = None
+    comment = None
     if request.GET.has_key('c'):
         content_type_id, object_id = request.GET['c'].split(':')
         try:
@@ -337 +338 @@
             obj = content_type.get_object_for_this_type(pk=object_id)
         except ObjectDoesNotExist:
             pass
-    return render_to_response('comments/posted.html', {'object': obj}, context_instance=RequestContext(request))
+        try:
+            comment_id = request.GET['if']
+            comment = FreeComment.objects.get(pk=comment_id)
+        except ObjectDoesNotExist:
+            pass            
+        try:
+            comment_id = request.GET['ic']
+            comment = Comment.objects.get(pk=comment_id)
+        except ObjectDoesNotExist:
+            pass            
+    return render_to_response('comments/posted.html', {'object': obj, 'comment': comment}, context_instance=RequestContext(request))