From 2eaa7be638854ec513be4966f526f2564aecb7dd Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Mon, 24 Jul 2017 09:31:13 -0400 Subject: Fix build failures on MySQL There's an actual bug in 213796fb4936dce1da2f0c097a054e1af5c25c2c around prepared statements being disabled. I'm looking into it, but in the mean time this gets the build green so it doesn't block other PRs --- .../lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 +- activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters') 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 8a9c497918..e762abc00f 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -495,7 +495,7 @@ module ActiveRecord def case_sensitive_comparison(table, attribute, column, value) # :nodoc: if column.collation && !column.case_sensitive? - table[attribute].eq(Arel::Nodes::Bin.new(value)) + table[attribute].eq(Arel::Nodes::Bin.new(Arel::Nodes::BindParam.new(value))) else super end diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index 2c2321872d..b02368a514 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -39,7 +39,7 @@ module ActiveRecord def initialize(connection, logger, connection_options, config) super - @prepared_statements = false unless config.key?(:prepared_statements) + @prepared_statements = true unless config[:prepared_statements] == false configure_connection end -- cgit v1.2.3