aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-18 15:45:28 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-18 15:45:28 -0300
commit63ce8a1112b38ccb3aca4502a38dd211fbe1b785 (patch)
treea3bbf4d996c21394839850097bb8608bde992865
parentbe4ccae9c3af357249d9d103fde28341e425cb02 (diff)
downloadrails-63ce8a1112b38ccb3aca4502a38dd211fbe1b785.tar.gz
rails-63ce8a1112b38ccb3aca4502a38dd211fbe1b785.tar.bz2
rails-63ce8a1112b38ccb3aca4502a38dd211fbe1b785.zip
Revert "Merge pull request #10043 from cconstantine/master"
This reverts commit 521035af530482d6d9ad2dae568eaeb0ab188e1c, reversing changes made to 222011dbee842bbc60d3aaaa3145356b90a30fd1. Reason: This broke the tests
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb15
-rw-r--r--activerecord/test/cases/adapters/postgresql/array_test.rb6
2 files changed, 0 insertions, 21 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
index a16e7facce..9b5170f657 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/database_statements.rb
@@ -44,21 +44,6 @@ module ActiveRecord
end
end
-
- # Inserts the given fixture into the table.
- def insert_fixture(fixture, table_name)
- columns = schema_cache.columns_hash(table_name)
-
- key_list = []
- value_list = fixture.map do |name, value|
- key_list << quote_column_name(name)
- [columns[name], value]
- end
-
- insert_statement = "INSERT INTO #{quote_table_name(table_name)} (#{key_list.join(", ")}) VALUES (#{key_list.count.times.map{|i| "$#{i+1}" }.join(", ")})"
- exec_insert(insert_statement, 'Fixture Insert', value_list)
- end
-
# Executes a SELECT query and returns an array of rows. Each row is an
# array of field values.
def select_rows(sql, name = nil)
diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index 5c629aed3d..8774bf626f 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -81,12 +81,6 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
assert_cycle(['1',nil,nil])
end
- def test_insert_fixture
- tag_values = ["val1", "val2", "val3_with_quote_'_char"]
- @connection.insert_fixture({"tags" => ["val1", "val2", "val3_with_quote_'_char"]}, "pg_arrays" )
- assert_equal(PgArray.last.tags, tag_values)
- end
-
private
def assert_cycle array
# test creation