diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-09 14:17:04 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-09 14:17:04 -0800 |
commit | da65fe9e11b7f445847228753e6df46d376e29ab (patch) | |
tree | 5580ad00a1c53d915e866bba529141ba2810ae5e /activerecord/lib/active_record/connection_adapters/abstract | |
parent | a67f25d50b5dd9585bb10ecd19bee6a34d69de6a (diff) | |
download | rails-da65fe9e11b7f445847228753e6df46d376e29ab.tar.gz rails-da65fe9e11b7f445847228753e6df46d376e29ab.tar.bz2 rails-da65fe9e11b7f445847228753e6df46d376e29ab.zip |
Revert "ask the fixture set for the sql statements"
This reverts commit 026d0555685087845b74dd87a0417b5a164b1c13.
Conflicts:
activerecord/lib/active_record/fixtures.rb
Fixes #13383
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb | 6 |
1 files changed, 1 insertions, 5 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 e196df079b..c90915c509 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -286,10 +286,6 @@ 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 = [] @@ -298,7 +294,7 @@ module ActiveRecord quote(value, columns[name]) end - "INSERT INTO #{quote_table_name(table_name)} (#{key_list.join(', ')}) VALUES (#{value_list.join(', ')})" + execute "INSERT INTO #{quote_table_name(table_name)} (#{key_list.join(', ')}) VALUES (#{value_list.join(', ')})", 'Fixture Insert' end def empty_insert_statement_value |