ask the fixture set for the sql statements

2 files changed, 17 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
index e1f29ea03a..06a2ddb8b7 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -286,6 +286,10 @@ module ActiveRecord
       # Inserts the given fixture into the table. Overridden in adapters that require
       # something beyond a simple insert (eg. Oracle).
       def insert_fixture(fixture, table_name)
+        execute fixture_sql(fixture, table_name), 'Fixture Insert'
+      end
+
+      def fixture_sql(fixture, table_name)
         columns = schema_cache.columns_hash(table_name)
 
         key_list   = []
@@ -294,7 +298,7 @@ module ActiveRecord
           quote(value, columns[name])
         end
 
-        execute "INSERT INTO #{quote_table_name(table_name)} (#{key_list.join(', ')}) VALUES (#{value_list.join(', ')})", 'Fixture Insert'
+        "INSERT INTO #{quote_table_name(table_name)} (#{key_list.join(', ')}) VALUES (#{value_list.join(', ')})"
       end
 
       def empty_insert_statement_value
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 3bb3131bd1..8601414209 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -504,16 +504,8 @@ module ActiveRecord
           connection.transaction(:requires_new => true) do
             fixture_sets.each do |fs|
               conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection
-              table_rows = fs.table_rows
-
-              table_rows.keys.each do |table|
-                conn.delete "DELETE FROM #{conn.quote_table_name(table)}", 'Fixture Delete'
-              end
-
-              table_rows.each do |fixture_set_name, rows|
-                rows.each do |row|
-                  conn.insert_fixture(row, fixture_set_name)
-                end
+              fs.fixture_sql(conn).each do |stmt|
+                conn.execute stmt
               end
             end
 
@@ -580,6 +572,16 @@ module ActiveRecord
       fixtures.size
     end
 
+    def fixture_sql(conn)
+      table_rows = self.table_rows
+
+      table_rows.keys.map { |table|
+        "DELETE FROM #{conn.quote_table_name(table)}"
+      }.concat table_rows.flat_map { |fixture_set_name, rows|
+        rows.map { |row| conn.fixture_sql(row, fixture_set_name) }
+      }
+    end
+
     # Return a hash of rows to be inserted. The key is the table, the value is
     # a list of rows to insert to that table.
     def table_rows