提交 8caaa08a 编写于 作者: A Aaron Patterson

push the collectors up to the abstract adapter

上级 f6d46d9c
......@@ -6,6 +6,8 @@
require 'active_record/connection_adapters/abstract/schema_dumper'
require 'active_record/connection_adapters/abstract/schema_creation'
require 'monitor'
require 'arel/collectors/bind'
require 'arel/collectors/sql_string'
module ActiveRecord
module ConnectionAdapters # :nodoc:
......@@ -105,6 +107,26 @@ def initialize(connection, logger = nil, pool = nil) #:nodoc:
@prepared_statements = false
end
class BindCollector < Arel::Collectors::Bind
def compile(bvs, conn)
super(bvs.map { |bv| conn.quote(*bv.reverse) })
end
end
class SQLString < Arel::Collectors::SQLString
def compile(bvs, conn)
super(bvs)
end
end
def collector
if @prepared_statements
SQLString.new
else
BindCollector.new
end
end
def valid_type?(type)
true
end
......
......@@ -198,26 +198,6 @@ def initialize(connection, logger, connection_options, config)
end
end
class BindCollector < Arel::Collectors::Bind
def compile(bvs, conn)
super(bvs.map { |bv| conn.quote(*bv.reverse) })
end
end
class SQLString < Arel::Collectors::SQLString
def compile(bvs, conn)
super(bvs)
end
end
def collector
if @prepared_statements
SQLString.new
else
BindCollector.new
end
end
def adapter_name #:nodoc:
self.class::ADAPTER_NAME
end
......
......@@ -140,26 +140,6 @@ def initialize(connection, logger, config)
end
end
class BindCollector < Arel::Collectors::Bind
def compile(bvs, conn)
super(bvs.map { |bv| conn.quote(*bv.reverse) })
end
end
class SQLString < Arel::Collectors::SQLString
def compile(bvs, conn)
super(bvs)
end
end
def collector
if @prepared_statements
SQLString.new
else
BindCollector.new
end
end
def adapter_name #:nodoc:
'SQLite'
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册