aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-08 10:19:58 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-08 10:19:58 -0300
commit22f31214a01eb5ad39adf18ca3f7c53ae100f971 (patch)
treeb6917abc0dae2016c3555866f42eaffd08b01d93 /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
parentde2815746873aaa9aee15e027adf605eb3b00d1d (diff)
parent9f549212c3b6c8ae4684da61e03a04da9f341fad (diff)
downloadrails-22f31214a01eb5ad39adf18ca3f7c53ae100f971.tar.gz
rails-22f31214a01eb5ad39adf18ca3f7c53ae100f971.tar.bz2
rails-22f31214a01eb5ad39adf18ca3f7c53ae100f971.zip
Merge pull request #8966 from cfabianski/disable_prepared_statement_when_preparing_a_query
Unprepared Visitor + unprepared_statement Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index be4a30aed9..f88f5742a8 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -143,7 +143,7 @@ module ActiveRecord
if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true })
@visitor = Arel::Visitors::MySQL.new self
else
- @visitor = BindSubstitution.new self
+ @visitor = unprepared_visitor
end
end