Ticket #13656: django-management-dbs.2.diff

django/core/management/base.py

@@ -218 +218 @@
             output = self.handle(*args, **options)
             if output:
                 if self.output_transaction:
-                    # This needs to be imported here, because it relies on settings.
-                    from django.db import connection
+                    # This needs to be imported here, because it relies on
+                    # settings.
+                    from django.db import connections, DEFAULT_DB_ALIAS
+                    connection = connections[options.get('database', DEFAULT_DB_ALIAS)]
                     if connection.ops.start_transaction_sql():
                         print self.style.SQL_KEYWORD(connection.ops.start_transaction_sql())
                 print output
                 if self.output_transaction:
-                    print self.style.SQL_KEYWORD("COMMIT;")
+                    print self.style.SQL_KEYWORD(connection.ops.end_transaction_sql())
         except CommandError, e:
             sys.stderr.write(smart_str(self.style.ERROR('Error: %s\n' % e)))
             sys.exit(1)

django/db/backends/__init__.py

@@ -352 +352 @@
         Returns the SQL statement required to start a transaction.
         """
         return "BEGIN;"
+    
+    def end_transaction_sql(self, fails=False):
+        if fails:
+            return "ROLLBACK;"
+        return "COMMIT;"
 
     def tablespace_sql(self, tablespace, inline=False):
         """