aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-04-09 15:50:38 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-04-09 15:50:38 -0700
commit85223653ebcfa1f9bd05126160c3c1676527e83c (patch)
tree32783a51511619a495a0196688d0073bc8a11db4 /activerecord/lib/active_record
parentd073fc3119244cdca54c549fd539e3bd6576066a (diff)
downloadrails-85223653ebcfa1f9bd05126160c3c1676527e83c.tar.gz
rails-85223653ebcfa1f9bd05126160c3c1676527e83c.tar.bz2
rails-85223653ebcfa1f9bd05126160c3c1676527e83c.zip
mysql tests are passing again
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb8
1 files changed, 7 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 02777e6806..4a51bddbdf 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -204,9 +204,15 @@ module ActiveRecord
end
end
+ class SQLString < Arel::Collectors::SQLString
+ def compile(bvs, conn)
+ super(bvs)
+ end
+ end
+
def collector
if @prepared_statements
- Arel::Collectors::SQLString.new
+ SQLString.new
else
BindCollector.new
end