diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-03-28 18:12:51 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-28 18:12:51 -0400 |
commit | 5ac89b168b049e895cc26db90fe54ee77b63bcbc (patch) | |
tree | a449070d659b85bd6af6ab2edc643438cd3a0bb3 /activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | |
parent | d046390c324142afffbf105075a1f4998c149c14 (diff) | |
parent | e4108fc619e0f1c28cdec6049d31f2db01d56dfd (diff) | |
download | rails-5ac89b168b049e895cc26db90fe54ee77b63bcbc.tar.gz rails-5ac89b168b049e895cc26db90fe54ee77b63bcbc.tar.bz2 rails-5ac89b168b049e895cc26db90fe54ee77b63bcbc.zip |
Merge pull request #28052 from kamipo/make_internal_methods_to_private
Make internal methods to private
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 550b4cc86b..96083e6519 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -74,7 +74,7 @@ module ActiveRecord SIMPLE_INT = /\A\d+\z/ attr_accessor :visitor, :pool - attr_reader :schema_cache, :owner, :logger + attr_reader :schema_cache, :owner, :logger, :prepared_statements alias :in_use? :owner def self.type_cast_config_to_integer(config) @@ -93,8 +93,6 @@ module ActiveRecord end end - attr_reader :prepared_statements - def initialize(connection, logger = nil, config = {}) # :nodoc: super() @@ -142,26 +140,10 @@ module ActiveRecord end end - def collector - if prepared_statements - SQLString.new - else - BindCollector.new - end - end - - def arel_visitor # :nodoc: - Arel::Visitors::ToSql.new(self) - end - def valid_type?(type) # :nodoc: !native_database_types[type].nil? end - def schema_creation - SchemaCreation.new self - end - # this method must only be called while holding connection pool's mutex def lease if in_use? @@ -475,14 +457,6 @@ module ActiveRecord end end - def new_column(name, default, sql_type_metadata, null, table_name, default_function = nil, collation = nil) # :nodoc: - Column.new(name, default, sql_type_metadata, null, table_name, default_function, collation) - end - - def lookup_cast_type(sql_type) # :nodoc: - type_map.lookup(sql_type) - end - def column_name_for_operation(operation, node) # :nodoc: visitor.accept(node, collector).value end @@ -629,6 +603,18 @@ module ActiveRecord columns(table_name).detect { |c| c.name == column_name } || raise(ActiveRecordError, "No such column: #{table_name}.#{column_name}") end + + def collector + if prepared_statements + SQLString.new + else + BindCollector.new + end + end + + def arel_visitor + Arel::Visitors::ToSql.new(self) + end end end end |