activerecord-oracle_enhanced-adapter 6.1.2 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe153e95c0604a0c3c4d99c15e96122be421cf0ae458508cd0177a57434afe9e
-  data.tar.gz: 4d0bb45de045b0a51dfdd4c7328ad64999c2b4494e10791f361ae95f7d805523
+  metadata.gz: 28b353a0c4917c1696bc44c5c3e60565c2863fc6639e48ff71814064394497a5
+  data.tar.gz: bdf94614cb38f1ad7ab121f580164ccb48e974ac7f09bcce3bbdfaca7cc51ca8
 SHA512:
-  metadata.gz: 1d692b70253c15a57353fe49cb6a576b067c00614fba6ed6f6eaef5169364c5e1899c0e69c9c8259224d9b7d6e0c1ac4299a31dad812403c51c41bbfeb90bfb3
-  data.tar.gz: 7f1b51e8ced3139c1a380804b772113ae3004d045de9c4b2c1632b833364b06f434b4b10446fc3a60290578f44fca2dde368227a25cfa4aefdaa101404baf252
+  metadata.gz: b0586d8753686b7f81a2b8137397fe0ab9af4f0607775f866f06e0625d9dc9eae480093bbb73f9331798dcba124b5d0b86039d06e039827281cbb05ba2e9b0dc
+  data.tar.gz: 90c2613d22b1705db2f82d5dca382327c3b4c36edba9ac46879441614b143e136e054eed07aebb2f12b06aac95e7d89e17021ac62dfb22f8efaa67206577d341

data/History.md

@@ -1,3 +1,90 @@
+## 7.0.0 / 2021-12-16
+* Changes and bug fixes
+  * Support Rails 7.0.0
+
+## 7.0.0.rc1 / 2021-12-08
+
+* Changes and bug fixes
+  * Support Rails 7.0.0.rc1
+  * Rails 7 requires Ruby 2.7 and prefer Ruby 3+ [#2136]
+  * Allow usage of JDBC statement caching by DB config parameter [#2088]
+  * structure dump: read column comments from all_tab_cols [#2121]
+  * Usage of bind variables for volatile filter conditions (3) [#2125]
+  * attribute should not require a connection is established [#2136]
+  * Allow Adapter#select_all to be performed asynchronously from a background thread pool [#2146]
+  * Avoid extra BindParam allocation to generate placeholder in queries [#2157]
+  * Address undefined method `to_i' for #<ActiveModel::Attribute::WithCastValue [#2159]
+  * Update Rails default branch name change [#2126]
+  * Optimize remove_columns to use a single SQL statement when supported [#2182]
+  * Refactor schema creation to extract new_foreign_key_definition [#2183]
+  * Address "NoMethodError: undefined method `partial_writes?'" [#2188]
+  * Suppress partial_writes deprecation warning [#2189]
+  * Make default_timezone a module instance variable [#2190]
+  * Define adapter type maps statically when possible [#2199]
+  * Rename _type_cast to type_cast [#2199]
+  * Rename _quote to quote [#2199]
+  * Always use OpenSSL constants for Digest operations [#2217]
+  * Refactor ActiveRecord::QueryLogs hook point [#2218]
+  * Enable Style/RedundantRegexpEscape cop [#2074]
+  * Enable Lint/DuplicateRequire cop [#2107]
+  * Enable Layout/SpaceBeforeBrackets cop [#2108]
+  * Enable Performance/BindCall cop [#2140]
+  * Enable Performance/StringReplacement cop [#2175]
+  * Enable Performance/MapCompact cop [#2176]
+  * Enable Layout/EndOfLine cop [#2177]
+  * Enable Performance/SelectMap cop [#2178]
+  * Enable Layout/ClosingParenthesisIndentation cop [#2193]
+  * Enable Style/ExplicitBlockArgument cop [#2209]
+  * Enable Lint/DuplicateMethods cop [#2215]
+  * Disable Lint/ShadowingOuterLocalVariable cop [#2137]
+  * Disable Layout/FirstArgumentIndentation cop [#2149]
+  * Opt out of SuggestExtensions message [#2133]
+  * Suppress RuboCop's offense [#2196]
+  * Support RuboCop 1.19.0 [#2204]
+  * Prevent from including ojdbc8.jar file to gem file [#2164]
+
+* CI
+  * Disable CI against JRuby builds [#2136]
+  * CI against Ruby 3.0.0 [#2091]
+  * CI against Ruby 3.0.1 and 2.7.3 [#2173]
+  * CI against Ruby 3.0.2 and 2.7.4 [#2195]
+  * Exclude ruby-head and ruby-debug until minitest allows Ruby 3.1 [#2094]
+  * Address Travis CI warnings and bump Ubuntu version to 20.04 [#2086]
+  * Tidy up Travis CI configuration [#2116]
+  * Tweak representation of build matrix [#2129]
+  * Install Oracle JDBC driver ojdbc11.jar for GitHub Actions [#2172]
+  * Address guides/bug_report_templates/active_record_gem_spec.rb error [#2101]
+  * Use Oracle Instant Client 21.1.0.0.0 [#2205]
+  * Use Oracle Instant Client 21.4 [#2199]
+  * Use gvenzl/oracle-xe docker image [#2206]
+
+## 6.1.5 / 2021-12-07
+
+* Changes and bug fixes
+  * get root cause if something went wrong with jdbc.OracleDriver [#2180 #2181]
+
+* CI
+  * Bump CRuby versions at Travis CI for release61 branch [#2192]
+
+## 6.1.4 / 2021-04-01
+
+* Changes and bug fixes
+  * Support use of ojdbc11.jar [#2155, #2168]
+  * Add missing default granted permission "ulimited tablespace" [#2156, #2167]
+  * Prevent from including ojdbc8.jar file to gem file [#2163, #2164, #2165]
+  * Oracle enhanced adapter 6.1.3 has been yanked since #2163
+
+* CI
+  * Allow-failure CI against jruby-head for release61 branch [#2166]
+
+## 6.1.3 / 2021-03-31
+
+* Changes and bug fixes
+  * Address FrozenError (can't modify frozen Hash): error [#2139 #2151 #2160]
+
+* CI
+  * CI against JRuby 9.2.15.0 [#2150]
+
 ## 6.1.2 / 2021-02-10
 * Changes and bug fixes
   * Fixed ORA-01935: missing user or role name with config read issue [#1943 #2135, #2142]

data/README.md

@@ -6,10 +6,21 @@ Oracle enhanced adapter for ActiveRecord
 DESCRIPTION
 -----------
 
-Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby on Rails applications. Oracle enhanced adapter can be used from Ruby on Rails versions between 2.3.x and 6.0 and it is working with Oracle database versions 10g and higher
+Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby on Rails applications. Oracle enhanced adapter can be used from Ruby on Rails versions between 2.3.x and 7.0 and it is working with Oracle database versions 10g and higher
 
 INSTALLATION
 ------------
+### Rails 7.0
+
+Oracle enhanced adapter version 7.0 supports Rails 7.0
+When using Ruby on Rails version 7.0 then in Gemfile include
+
+```ruby
+# Use oracle as the database for Active Record
+gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.0'
+gem 'ruby-oci8' # only for CRuby users
+```
+
 ### Rails 6.1
 
 Oracle enhanced adapter version 6.1 supports Rails 6.1.

data/VERSION

@@ -1 +1 @@
-6.1.2
+7.0.0

data/lib/active_record/connection_adapters/emulation/oracle_adapter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ActiveRecord::ConnectionAdapters::OracleAdapter < ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter #:nodoc:
+class ActiveRecord::ConnectionAdapters::OracleAdapter < ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter # :nodoc:
   def adapter_name
     "Oracle"
   end

data/lib/active_record/connection_adapters/oracle_enhanced/column.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 module ActiveRecord
-  module ConnectionAdapters #:nodoc:
+  module ConnectionAdapters # :nodoc:
     module OracleEnhanced
       class Column < ActiveRecord::ConnectionAdapters::Column
         delegate :virtual, to: :sql_type_metadata, allow_nil: true
 
-        def initialize(name, default, sql_type_metadata = nil, null = true, comment: nil) #:nodoc:
+        def initialize(name, default, sql_type_metadata = nil, null = true, comment: nil) # :nodoc:
           super(name, default, sql_type_metadata, null, comment: comment)
         end
 

data/lib/active_record/connection_adapters/oracle_enhanced/connection.rb

@@ -4,7 +4,7 @@ module ActiveRecord
   module ConnectionAdapters
     # interface independent methods
     module OracleEnhanced
-      class Connection #:nodoc:
+      class Connection # :nodoc:
         def self.create(config)
           case ORACLE_ENHANCED_CONNECTION
           when :oci
@@ -36,25 +36,25 @@ module ActiveRecord
             sql = <<~SQL.squish
               SELECT owner, table_name, 'TABLE' name_type
               FROM all_tables
-              WHERE owner = '#{table_owner}'
-                AND table_name = '#{table_name}'
+              WHERE owner = :table_owner
+                AND table_name = :table_name
               UNION ALL
               SELECT owner, view_name table_name, 'VIEW' name_type
               FROM all_views
-              WHERE owner = '#{table_owner}'
-                AND view_name = '#{table_name}'
+              WHERE owner = :table_owner
+                AND view_name = :table_name
               UNION ALL
               SELECT table_owner, table_name, 'SYNONYM' name_type
               FROM all_synonyms
-              WHERE owner = '#{table_owner}'
-                AND synonym_name = '#{table_name}'
+              WHERE owner = :table_owner
+                AND synonym_name = :table_name
               UNION ALL
               SELECT table_owner, table_name, 'SYNONYM' name_type
               FROM all_synonyms
               WHERE owner = 'PUBLIC'
-                AND synonym_name = '#{real_name}'
+                AND synonym_name = :real_name
             SQL
-            if result = _select_one(sql)
+            if result = _select_one(sql, "CONNECTION", [table_owner, table_name, table_owner, table_name, table_owner, table_name, real_name])
               case result["name_type"]
               when "SYNONYM"
                 describe("#{result['owner'] && "#{result['owner']}."}#{result['table_name']}")
@@ -92,14 +92,23 @@ module ActiveRecord
 
           # Returns a record hash with the column names as keys and column values
           # as values.
+          # binds is a array of native values in contrast to ActiveRecord::Relation::QueryAttribute
           def _select_one(arel, name = nil, binds = [])
-            result = select(arel)
-            result.first if result
+            cursor = prepare(arel)
+            cursor.bind_params(binds)
+            cursor.exec
+            columns = cursor.get_col_names.map do |col_name|
+              _oracle_downcase(col_name)
+            end
+            row = cursor.fetch
+            columns.each_with_index.map { |x, i| [x, row[i]] }.to_h if row
+          ensure
+            cursor.close
           end
 
           # Returns a single value from a record
           def _select_value(arel, name = nil, binds = [])
-            if result = _select_one(arel)
+            if result = _select_one(arel, name, binds)
               result.values.first
             end
           end
@@ -109,7 +118,7 @@ module ActiveRecord
       def database_version
         raise NoMethodError, "Not implemented for this raw driver"
       end
-      class ConnectionException < StandardError #:nodoc:
+      class ConnectionException < StandardError # :nodoc:
       end
     end
   end

data/lib/active_record/connection_adapters/oracle_enhanced/context_index.rb

@@ -153,14 +153,14 @@ module ActiveRecord
                 (p_rowid IN	      ROWID,
                 p_clob	IN OUT NOCOPY CLOB) IS
                 -- add_context_index_parameters #{(column_names + select_queries).inspect}#{!options.empty? ? +', ' << options.inspect[1..-2] : ''}
-                #{
+              #{
                 selected_columns.map do |cols|
                   cols.map do |col|
                     raise ArgumentError, "Alias #{col} too large, should be 28 or less characters long" unless col.length <= 28
                     "l_#{col} VARCHAR2(32767);\n"
                   end.join
                 end.join
-                } BEGIN
+              } BEGIN
                 FOR r1 IN (
                   SELECT #{quoted_column_names.join(', ')}
                   FROM	 #{quoted_table_name}
@@ -194,7 +194,7 @@ module ActiveRecord
                       "DBMS_LOB.WRITEAPPEND(p_clob, #{col.length + 3}, '</#{col}>');\n"
                     end.join)
                   end.join)
-                  }
+                }
                 END LOOP;
               END;
             SQL

data/lib/active_record/connection_adapters/oracle_enhanced/database_limits.rb

@@ -9,7 +9,7 @@ module ActiveRecord
         # maximum length of Oracle identifiers
         IDENTIFIER_MAX_LENGTH = 30
 
-        def table_alias_length #:nodoc:
+        def table_alias_length # :nodoc:
           IDENTIFIER_MAX_LENGTH
         end
 

data/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb

@@ -9,19 +9,18 @@ module ActiveRecord
         # see: abstract/database_statements.rb
 
         # Executes a SQL statement
-        def execute(sql, name = nil)
-          log(sql, name) { @connection.exec(sql) }
-        end
+        def execute(sql, name = nil, async: false)
+          sql = transform_query(sql)
 
-        def clear_cache! # :nodoc:
-          reload_type_map
-          super
+          log(sql, name, async: async) { @connection.exec(sql) }
         end
 
-        def exec_query(sql, name = "SQL", binds = [], prepare: false)
+        def exec_query(sql, name = "SQL", binds = [], prepare: false, async: false)
+          sql = transform_query(sql)
+
           type_casted_binds = type_casted_binds(binds)
 
-          log(sql, name, binds, type_casted_binds) do
+          log(sql, name, binds, type_casted_binds, async: async) do
             cursor = nil
             cached = false
             with_retry do
@@ -79,7 +78,7 @@ module ActiveRecord
         # New method in ActiveRecord 3.1
         # Will add RETURNING clause in case of trigger generated primary keys
         def sql_for_insert(sql, pk, binds)
-          unless pk == false || pk.nil? || pk.is_a?(Array)
+          unless pk == false || pk.nil? || pk.is_a?(Array) || pk.is_a?(String)
             sql = "#{sql} RETURNING #{quote_column_name(pk)} INTO :returning_id"
             (binds = binds.dup) << ActiveRecord::Relation::QueryAttribute.new("returning_id", nil, Type::OracleEnhanced::Integer.new)
           end
@@ -164,7 +163,7 @@ module ActiveRecord
 
         alias :exec_delete :exec_update
 
-        def begin_db_transaction #:nodoc:
+        def begin_db_transaction # :nodoc:
           @connection.autocommit = false
         end
 
@@ -183,27 +182,27 @@ module ActiveRecord
           execute "SET TRANSACTION ISOLATION LEVEL  #{transaction_isolation_levels.fetch(isolation)}"
         end
 
-        def commit_db_transaction #:nodoc:
+        def commit_db_transaction # :nodoc:
           @connection.commit
         ensure
           @connection.autocommit = true
         end
 
-        def exec_rollback_db_transaction #:nodoc:
+        def exec_rollback_db_transaction # :nodoc:
           @connection.rollback
         ensure
           @connection.autocommit = true
         end
 
-        def create_savepoint(name = current_savepoint_name) #:nodoc:
+        def create_savepoint(name = current_savepoint_name) # :nodoc:
           execute("SAVEPOINT #{name}", "TRANSACTION")
         end
 
-        def exec_rollback_to_savepoint(name = current_savepoint_name) #:nodoc:
+        def exec_rollback_to_savepoint(name = current_savepoint_name) # :nodoc:
           execute("ROLLBACK TO #{name}", "TRANSACTION")
         end
 
-        def release_savepoint(name = current_savepoint_name) #:nodoc:
+        def release_savepoint(name = current_savepoint_name) # :nodoc:
           # there is no RELEASE SAVEPOINT statement in Oracle
         end
 
@@ -214,7 +213,7 @@ module ActiveRecord
         end
 
         # Inserts the given fixture into the table. Overridden to properly handle lobs.
-        def insert_fixture(fixture, table_name) #:nodoc:
+        def insert_fixture(fixture, table_name) # :nodoc:
           super
 
           if ActiveRecord::Base.pluralize_table_names
@@ -249,7 +248,7 @@ module ActiveRecord
         end
 
         # Writes LOB values from attributes for specified columns
-        def write_lobs(table_name, klass, attributes, columns) #:nodoc:
+        def write_lobs(table_name, klass, attributes, columns) # :nodoc:
           id = quote(attributes[klass.primary_key])
           columns.each do |col|
             value = attributes[col.name]

data/lib/active_record/connection_adapters/oracle_enhanced/dbms_output.rb

@@ -31,7 +31,7 @@ module ActiveRecord
         end
 
       private
-        def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
+        def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil, async: false)
           super
         ensure
           log_dbms_output if dbms_output_enabled?

data/lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb

@@ -16,7 +16,8 @@ begin
   # Oracle 11g client ojdbc6.jar is also compatible with Java 1.7
   # Oracle 12c Release 1 client provides ojdbc7.jar
   # Oracle 12c Release 2 client provides ojdbc8.jar
-  ojdbc_jars = %w(ojdbc8.jar ojdbc7.jar ojdbc6.jar)
+  # Oracle 21c provides ojdbc11.jar for Java 11 and above
+  ojdbc_jars = %w(ojdbc11.jar ojdbc8.jar ojdbc7.jar ojdbc6.jar)
 
   if !ENV_JAVA["java.class.path"]&.match?(Regexp.new(ojdbc_jars.join("|")))
     # On Unix environment variable should be PATH, on Windows it is sometimes Path
@@ -42,16 +43,16 @@ begin
     java.lang.System.set_property("oracle.net.tns_admin", ENV["TNS_ADMIN"])
   end
 
-rescue LoadError, NameError
+rescue LoadError, NameError => e
   # JDBC driver is unavailable.
-  raise LoadError, "ERROR: ActiveRecord oracle_enhanced adapter could not load Oracle JDBC driver. Please install #{ojdbc_jars.join(' or ') } library."
+  raise LoadError, "ERROR: ActiveRecord oracle_enhanced adapter could not load Oracle JDBC driver. Please install #{ojdbc_jars.join(' or ') } library.\n#{e.class}:#{e.message}"
 end
 
 module ActiveRecord
   module ConnectionAdapters
     # JDBC database interface for JRuby
     module OracleEnhanced
-      class JDBCConnection < OracleEnhanced::Connection #:nodoc:
+      class JDBCConnection < OracleEnhanced::Connection # :nodoc:
         attr_accessor :active
         alias :active? :active
 
@@ -98,6 +99,8 @@ module ActiveRecord
               @raw_connection = @raw_connection.underlying_connection
             end
 
+            # Workaround FrozenError (can't modify frozen Hash):
+            config = config.dup
             config[:driver] ||= @raw_connection.meta_data.connection.java_class.name
             username = @raw_connection.meta_data.user_name
           else
@@ -113,7 +116,7 @@ module ActiveRecord
             if database && (using_tns_alias || host == "connection-string")
               url = "jdbc:oracle:thin:@#{database}"
             else
-              unless database.match?(/^(\:|\/)/)
+              unless database.match?(/^(:|\/)/)
                 # assume database is a SID if no colon or slash are supplied (backward-compatibility)
                 database = "/#{database}"
               end
@@ -142,12 +145,18 @@ module ActiveRecord
             end
 
             # Set session time zone to current time zone
-            if ActiveRecord::Base.default_timezone == :local
+            if ActiveRecord.default_timezone == :local
               @raw_connection.setSessionTimeZone(time_zone)
-            elsif ActiveRecord::Base.default_timezone == :utc
+            elsif ActiveRecord.default_timezone == :utc
               @raw_connection.setSessionTimeZone("UTC")
             end
 
+            if config[:jdbc_statement_cache_size]
+              raise "Integer value expected for :jdbc_statement_cache_size" unless config[:jdbc_statement_cache_size].instance_of? Integer
+              @raw_connection.setImplicitCachingEnabled(true)
+              @raw_connection.setStatementCacheSize(config[:jdbc_statement_cache_size])
+            end
+
             # Set default number of rows to prefetch
             # @raw_connection.setDefaultRowPrefetch(prefetch_rows) if prefetch_rows
           end
@@ -489,13 +498,13 @@ module ActiveRecord
             if dt = rset.getDATE(i)
               d = dt.dateValue
               t = dt.timeValue
-              Time.send(Base.default_timezone, d.year + 1900, d.month + 1, d.date, t.hours, t.minutes, t.seconds)
+              Time.send(ActiveRecord.default_timezone, d.year + 1900, d.month + 1, d.date, t.hours, t.minutes, t.seconds)
             else
               nil
             end
           when :TIMESTAMP, :TIMESTAMPTZ, :TIMESTAMPLTZ, :"TIMESTAMP WITH TIME ZONE", :"TIMESTAMP WITH LOCAL TIME ZONE"
             ts = rset.getTimestamp(i)
-            ts && Time.send(Base.default_timezone, ts.year + 1900, ts.month + 1, ts.date, ts.hours, ts.minutes, ts.seconds,
+            ts && Time.send(ActiveRecord.default_timezone, ts.year + 1900, ts.month + 1, ts.date, ts.hours, ts.minutes, ts.seconds,
               ts.nanos / 1000)
           when :CLOB
             get_lob_value ? lob_to_ruby_value(rset.getClob(i)) : rset.getClob(i)

data/lib/active_record/connection_adapters/oracle_enhanced/jdbc_quoting.rb

@@ -4,7 +4,7 @@ module ActiveRecord
   module ConnectionAdapters
     module OracleEnhanced
       module JDBCQuoting
-        def _type_cast(value)
+        def type_cast(value)
           case value
           when ActiveModel::Type::Binary::Data
             blob = Java::OracleSql::BLOB.createTemporary(@connection.raw_connection, false, Java::OracleSql::BLOB::DURATION_SESSION)

data/lib/active_record/connection_adapters/oracle_enhanced/lob.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-module ActiveRecord #:nodoc:
-  module ConnectionAdapters #:nodoc:
-    module OracleEnhanced #:nodoc:
-      module Lob #:nodoc:
+module ActiveRecord # :nodoc:
+  module ConnectionAdapters # :nodoc:
+    module OracleEnhanced # :nodoc:
+      module Lob # :nodoc:
         extend ActiveSupport::Concern
 
         included do

data/lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb

@@ -26,7 +26,7 @@ module ActiveRecord
   module ConnectionAdapters
     # OCI database interface for MRI
     module OracleEnhanced
-      class OCIConnection < OracleEnhanced::Connection #:nodoc:
+      class OCIConnection < OracleEnhanced::Connection # :nodoc:
         def initialize(config)
           @raw_connection = OCI8EnhancedAutoRecover.new(config, OracleEnhancedOCIFactory)
           # default schema owner
@@ -289,9 +289,9 @@ module ActiveRecord
           end
           # code from Time.time_with_datetime_fallback
           begin
-            Time.send(Base.default_timezone, year, month, day, hour, min, sec, usec)
+            Time.send(ActiveRecord.default_timezone, year, month, day, hour, min, sec, usec)
           rescue
-            offset = Base.default_timezone.to_sym == :local ? ::DateTime.local_offset : 0
+            offset = ActiveRecord.default_timezone.to_sym == :local ? ::DateTime.local_offset : 0
             ::DateTime.civil(year, month, day, hour, min, sec, offset)
           end
         end
@@ -299,7 +299,7 @@ module ActiveRecord
 
       # The OracleEnhancedOCIFactory factors out the code necessary to connect and
       # configure an Oracle/OCI connection.
-      class OracleEnhancedOCIFactory #:nodoc:
+      class OracleEnhancedOCIFactory # :nodoc:
         DEFAULT_TCP_KEEPALIVE_TIME = 600
 
         def self.new_connection(config)
@@ -343,9 +343,9 @@ module ActiveRecord
           conn.non_blocking = true if async
           conn.prefetch_rows = prefetch_rows
           conn.exec "alter session set cursor_sharing = #{cursor_sharing}" rescue nil if cursor_sharing
-          if ActiveRecord::Base.default_timezone == :local
+          if ActiveRecord.default_timezone == :local
             conn.exec "alter session set time_zone = '#{time_zone}'" unless time_zone.blank?
-          elsif ActiveRecord::Base.default_timezone == :utc
+          elsif ActiveRecord.default_timezone == :utc
             conn.exec "alter session set time_zone = '+00:00'"
           end
           conn.exec "alter session set current_schema = #{schema}" unless schema.blank?
@@ -375,18 +375,18 @@ end
 # this would be dangerous (as the earlier part of the implied transaction
 # may have failed silently if the connection died) -- so instead the
 # connection is marked as dead, to be reconnected on it's next use.
-#:stopdoc:
-class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
-  attr_accessor :active #:nodoc:
-  alias :active? :active #:nodoc:
+# :stopdoc:
+class OCI8EnhancedAutoRecover < DelegateClass(OCI8) # :nodoc:
+  attr_accessor :active # :nodoc:
+  alias :active? :active # :nodoc:
 
   cattr_accessor :auto_retry
   class << self
-    alias :auto_retry? :auto_retry #:nodoc:
+    alias :auto_retry? :auto_retry # :nodoc:
   end
   @@auto_retry = false
 
-  def initialize(config, factory) #:nodoc:
+  def initialize(config, factory) # :nodoc:
     @active = true
     @config = config
     @factory = factory
@@ -397,7 +397,7 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
   # Checks connection, returns true if active. Note that ping actively
   # checks the connection, while #active? simply returns the last
   # known state.
-  def ping #:nodoc:
+  def ping # :nodoc:
     @connection.exec("select 1 from dual") { |r| nil }
     @active = true
   rescue
@@ -406,7 +406,7 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
   end
 
   # Resets connection, by logging off and creating a new connection.
-  def reset! #:nodoc:
+  def reset! # :nodoc:
     logoff rescue nil
     begin
       @connection = @factory.new_connection @config
@@ -423,10 +423,10 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
   # ORA-03113: end-of-file on communication channel
   # ORA-03114: not connected to ORACLE
   # ORA-03135: connection lost contact
-  LOST_CONNECTION_ERROR_CODES = [ 28, 1012, 3113, 3114, 3135 ] #:nodoc:
+  LOST_CONNECTION_ERROR_CODES = [ 28, 1012, 3113, 3114, 3135 ] # :nodoc:
 
   # Adds auto-recovery functionality.
-  def with_retry #:nodoc:
+  def with_retry # :nodoc:
     should_retry = self.class.auto_retry? && autocommit?
 
     begin
@@ -441,8 +441,8 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
     end
   end
 
-  def exec(sql, *bindvars, &block) #:nodoc:
+  def exec(sql, *bindvars, &block) # :nodoc:
     with_retry { @connection.exec(sql, *bindvars, &block) }
   end
 end
-#:startdoc:
+# :startdoc:

data/lib/active_record/connection_adapters/oracle_enhanced/oci_quoting.rb

@@ -4,7 +4,7 @@ module ActiveRecord
   module ConnectionAdapters
     module OracleEnhanced
       module OCIQuoting
-        def _type_cast(value)
+        def type_cast(value)
           case value
           when ActiveModel::Type::Binary::Data
             lob_value = value == "" ? " " : value

data/lib/active_record/connection_adapters/oracle_enhanced/procedures.rb

@@ -2,7 +2,7 @@
 
 require "active_support"
 
-module ActiveRecord #:nodoc:
+module ActiveRecord # :nodoc:
   # Custom create, update, delete methods functionality.
   #
   # Example:
@@ -33,7 +33,7 @@ module ActiveRecord #:nodoc:
   #     end
   #   end
   #
-  module OracleEnhancedProcedures #:nodoc:
+  module OracleEnhancedProcedures # :nodoc:
     module ClassMethods
       # Specify custom create method which should be used instead of Rails generated INSERT statement.
       # Provided block should return ID of new record.
@@ -83,7 +83,7 @@ module ActiveRecord #:nodoc:
       end
     end
 
-    def destroy #:nodoc:
+    def destroy # :nodoc:
       # check if class has custom delete method
       if self.class.custom_delete_method
         # wrap destroy in transaction
@@ -150,7 +150,7 @@ module ActiveRecord #:nodoc:
               end
             end
             # update just dirty attributes
-            if partial_writes?
+            if partial_updates?
               # Serialized attributes should always be written in case they've been
               # changed in place.
               update_using_custom_method(changed | (attributes.keys & self.class.columns.select { |column| column.is_a?(Type::Serialized) }))
@@ -185,8 +185,8 @@ module ActiveRecord #:nodoc:
         freeze
       end
 
-      def log_custom_method(*args)
-        self.class.connection.send(:log, *args) { yield }
+      def log_custom_method(*args, &block)
+        self.class.connection.send(:log, *args, &block)
       end
 
       alias_method :update_record, :_update_record if private_method_defined?(:_update_record)