diff options
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb | 12 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/oracle_adapter.rb | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb index 8b70b2f047..2cdc8af688 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb @@ -38,7 +38,7 @@ module ActiveRecord end # set concurrency support flag (not thread safe, like most of the methods in this file) - def allow_concurrency=(threaded) + def allow_concurrency=(threaded) #:nodoc: logger.debug "allow_concurrency=#{threaded}" if logger return if @@allow_concurrency == threaded clear_all_cached_connections! @@ -51,7 +51,7 @@ module ActiveRecord log_connections if logger end - def active_connection_name + def active_connection_name #:nodoc: @active_connection_name ||= if active_connections[name] || @@defined_connections[name] name @@ -62,7 +62,7 @@ module ActiveRecord end end - def clear_active_connection_name + def clear_active_connection_name #:nodoc: @active_connection_name = nil subclasses.each { |klass| klass.clear_active_connection_name } end @@ -88,7 +88,7 @@ module ActiveRecord end # Verify active connections. - def verify_active_connections! + def verify_active_connections! #:nodoc: if @@allow_concurrency remove_stale_cached_threads!(@@active_connections) do |name, conn| conn.disconnect! @@ -244,7 +244,7 @@ module ActiveRecord end # Set the connection for the class. - def self.connection=(spec) + def self.connection=(spec) #:nodoc: if spec.kind_of?(ActiveRecord::ConnectionAdapters::AbstractAdapter) active_connections[name] = spec elsif spec.kind_of?(ConnectionSpecification) @@ -257,7 +257,7 @@ module ActiveRecord end # connection state logging - def self.log_connections + def self.log_connections #:nodoc: if logger logger.info "Defined connections: #{@@defined_connections.inspect}" logger.info "Active connections: #{active_connections.inspect}" diff --git a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb index 00d8aa7330..92120920fe 100644 --- a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb @@ -44,7 +44,11 @@ begin # Enable the id column to be bound into the sql later, by the adapter's insert method. # This is preferable to inserting the hard-coded value here, because the insert method # needs to know the id value explicitly. - alias :attributes_with_quotes_pre_oracle :attributes_with_quotes #:nodoc: + def attributes_with_quotes_pre_oracle #:nodoc: + attributes_with_quotes + end + + def attributes_with_quotes(creating = true) #:nodoc: aq = attributes_with_quotes_pre_oracle creating if connection.class == ConnectionAdapters::OracleAdapter @@ -542,7 +546,7 @@ begin @desc.attrGet(OCI_ATTR_PARAM) end - class OraObject + class OraObject #:nodoc: attr_reader :schema, :name def initialize(info) case info.attrGet(OCI_ATTR_PTYPE) |