activerecord-oracle_enhanced-adapter 7.1.1 → 7.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf9205c3bd6ee30bd105a8166789a7f7aa34ce9699405bfc8b174c016c55113
-  data.tar.gz: 3716edcbc87b8a8ecd55cb556706637cd038b7a10084235852fe91615c4ba6b2
+  metadata.gz: c92688a843f4614eaa882ff1d56ed98355a231e17910c40c4e987f5ab1e9f6af
+  data.tar.gz: ba50fcb6cf763090ee2738e68b61562b2d6647b19ef50e3686c6c050c2ca3f1a
 SHA512:
-  metadata.gz: 0a2a11722e534f9079995f462879d2592fc0df483e833dc4765f3df7c2fec0345a823cf2390b60a60a7c056ee31c503088fcf0342eeb02fa1e233c162926924b
-  data.tar.gz: 6c7a89267b1f9747c7bed9251f0d234eaaa1825be8d5efdf93566906c49d0258cd94a94354732b3381df195527b37a7d0fcf575b4ca4b46de6784cc6dd86cbfc
+  metadata.gz: 7f00d84542ab4c54b6ab9b4af21b2ec48f06f7f2caaefe5a32dcf980e96978714c1d3dfe0b3bf2850d4176cc980fc3c4c832d711bae3b9232c1647dd4314f209
+  data.tar.gz: 9b43052d20dbb1fade82857876130514dc4743f24d798567eea233a7753f2ac27806a7d14356875e3336142880ce9502a2bcc8308117df5ef6cd40ffe9573062

data/History.md

@@ -1,3 +1,11 @@
+## 7.2.0.rc1 / 2025-06-18
+
+* Changes and bug fixes
+  * Support Rails 7.2 [#2424]
+  * Bump the minimum Ruby version to 3.1 [#2442]
+  * Use RuboCop Plugin [#2427]
+  * Use Oracle Instant Client Version 23.8
+
 ## 7.1.1 / 2025-06-16
 
 * Changes and bug fixes

data/VERSION

@@ -1 +1 @@
-7.1.1
+7.2.0.rc1

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

@@ -4,19 +4,58 @@ module ActiveRecord
   module ConnectionAdapters
     module OracleEnhanced
       module Quoting
+        extend ActiveSupport::Concern
         # QUOTING ==================================================
         #
         # see: abstract/quoting.rb
         QUOTED_COLUMN_NAMES = Concurrent::Map.new # :nodoc:
         QUOTED_TABLE_NAMES = Concurrent::Map.new # :nodoc:
 
-        def quote_column_name(name) # :nodoc:
-          name = name.to_s
-          QUOTED_COLUMN_NAMES[name] ||= if /\A[a-z][a-z_0-9$#]*\Z/.match?(name)
-            "\"#{name.upcase}\""
-          else
-            # remove double quotes which cannot be used inside quoted identifier
-            "\"#{name.delete('"')}\""
+        module ClassMethods # :nodoc:
+          def column_name_matcher
+            /
+          \A
+          (
+            (?:
+              # "table_name"."column_name" | function(one or no argument)
+              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+") | \w+\((?:|\g<2>)\))
+            )
+            (?:(?:\s+AS)?\s+(?:\w+|"\w+"))?
+          )
+          (?:\s*,\s*\g<1>)*
+          \z
+        /ix
+          end
+
+          def column_name_with_order_matcher
+            /
+          \A
+          (
+            (?:
+              # "table_name"."column_name" | function(one or no argument)
+              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+") | \w+\((?:|\g<2>)\))
+            )
+            (?:\s+ASC|\s+DESC)?
+            (?:\s+NULLS\s+(?:FIRST|LAST))?
+          )
+          (?:\s*,\s*\g<1>)*
+          \z
+        /ix
+          end
+
+          def quote_column_name(name) # :nodoc:
+            name = name.to_s
+            QUOTED_COLUMN_NAMES[name] ||= if /\A[a-z][a-z_0-9$#]*\Z/.match?(name)
+              "\"#{name.upcase}\""
+            else
+              # remove double quotes which cannot be used inside quoted identifier
+              "\"#{name.delete('"')}\""
+            end
+          end
+
+          def quote_table_name(name) # :nodoc:
+            name, _link = name.to_s.split("@")
+            QUOTED_TABLE_NAMES[name] ||= [name.split(".").map { |n| quote_column_name(n) }].join(".")
           end
         end
 
@@ -67,11 +106,6 @@ module ActiveRecord
           !!(object_name =~ /[A-Z]/ && object_name =~ /[a-z]/)
         end
 
-        def quote_table_name(name) # :nodoc:
-          name, _link = name.to_s.split("@")
-          QUOTED_TABLE_NAMES[name] ||= [name.split(".").map { |n| quote_column_name(n) }].join(".")
-        end
-
         def quote_string(s) # :nodoc:
           s.gsub(/'/, "''")
         end
@@ -131,42 +165,6 @@ module ActiveRecord
           end
         end
 
-        def column_name_matcher
-          COLUMN_NAME
-        end
-
-        def column_name_with_order_matcher
-          COLUMN_NAME_WITH_ORDER
-        end
-
-        COLUMN_NAME = /
-          \A
-          (
-            (?:
-              # "table_name"."column_name" | function(one or no argument)
-              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+") | \w+\((?:|\g<2>)\))
-            )
-            (?:(?:\s+AS)?\s+(?:\w+|"\w+"))?
-          )
-          (?:\s*,\s*\g<1>)*
-          \z
-        /ix
-
-        COLUMN_NAME_WITH_ORDER = /
-          \A
-          (
-            (?:
-              # "table_name"."column_name" | function(one or no argument)
-              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+") | \w+\((?:|\g<2>)\))
-            )
-            (?:\s+ASC|\s+DESC)?
-            (?:\s+NULLS\s+(?:FIRST|LAST))?
-          )
-          (?:\s*,\s*\g<1>)*
-          \z
-        /ix
-        private_constant :COLUMN_NAME, :COLUMN_NAME_WITH_ORDER
-
         private
           def oracle_downcase(column_name)
             return nil if column_name.nil?

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

@@ -276,7 +276,7 @@ module ActiveRecord
         end
 
         def insert_versions_sql(versions) # :nodoc:
-          sm_table = quote_table_name(ActiveRecord::Base.connection.schema_migration.table_name)
+          sm_table = quote_table_name(ActiveRecord::Tasks::DatabaseTasks.migration_connection_pool.schema_migration.table_name)
 
           if supports_multi_insert?
             versions.inject(+"INSERT ALL\n") { |sql, version|

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -63,22 +63,6 @@ require "active_record/type/oracle_enhanced/timestampltz"
 require "active_record/type/oracle_enhanced/character_string"
 
 module ActiveRecord
-  module ConnectionHandling # :nodoc:
-    # Establishes a connection to the database that's used by all Active Record objects.
-    def oracle_enhanced_connection(config) # :nodoc:
-      if config[:emulate_oracle_adapter] == true
-        # allows the enhanced adapter to look like the OracleAdapter. Useful to pick up
-        # conditionals in the rails activerecord test suite
-        require "active_record/connection_adapters/emulation/oracle_adapter"
-        ConnectionAdapters::OracleAdapter.new(
-          ConnectionAdapters::OracleEnhanced::Connection.create(config), logger, config)
-      else
-        ConnectionAdapters::OracleEnhancedAdapter.new(
-          ConnectionAdapters::OracleEnhanced::Connection.create(config), logger, config)
-      end
-    end
-  end
-
   module ConnectionAdapters # :nodoc:
     # Oracle enhanced adapter will work with both
     # CRuby ruby-oci8 gem (which provides interface to Oracle OCI client)
@@ -837,6 +821,26 @@ module ActiveRecord
   end
 end
 
+## Register OracleEnhancedAdapter as the adapter to use for "oracle_enhanced" connection string
+if ActiveRecord::ConnectionAdapters.respond_to?(:register)
+  ActiveRecord::ConnectionAdapters.register(
+    "oracle_enhanced",
+    "ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter",
+    "active_record/connection_adapters/oracle_enhanced_adapter"
+  )
+
+  # This is similar to the notion of emulating the original OracleAdapter but
+  # using the OracleEnhancedAdapter instead, but without using the emulate flag.
+  # Instead this will get picked up if you set the adapter to 'oracle' in the database config.
+  #
+  # Register OracleAdapter as the adapter to use for "oracle" connection string
+  ActiveRecord::ConnectionAdapters.register(
+    "oracle",
+    "ActiveRecord::ConnectionAdapters::OracleAdapter",
+    "active_record/connection_adapters/emulation/oracle_adapter"
+  )
+end
+
 require "active_record/connection_adapters/oracle_enhanced/version"
 
 module ActiveRecord

data/lib/arel/visitors/oracle.rb

@@ -195,14 +195,6 @@ module Arel # :nodoc: all
           array
         end
 
-        def visit_ActiveModel_Attribute(o, collector)
-          collector.add_bind(o) { |i| ":a#{i}" }
-        end
-
-        def visit_Arel_Nodes_BindParam(o, collector)
-          collector.add_bind(o.value) { |i| ":a#{i}" }
-        end
-
         def is_distinct_from(o, collector)
           collector << "DECODE("
           collector = visit [o.left, o.right, 0, 1], collector

data/lib/arel/visitors/oracle12.rb

@@ -100,14 +100,6 @@ module Arel # :nodoc: all
           super
         end
 
-        def visit_ActiveModel_Attribute(o, collector)
-          collector.add_bind(o) { |i| ":a#{i}" }
-        end
-
-        def visit_Arel_Nodes_BindParam(o, collector)
-          collector.add_bind(o.value) { |i| ":a#{i}" }
-        end
-
         def is_distinct_from(o, collector)
           collector << "DECODE("
           collector = visit [o.left, o.right, 0, 1], collector

data/lib/arel/visitors/oracle_common.rb

@@ -3,6 +3,11 @@
 module Arel # :nodoc: all
   module Visitors
     module OracleCommon
+      BIND_BLOCK = proc { |i| ":a#{i}" }
+      private_constant :BIND_BLOCK
+
+      def bind_block; BIND_BLOCK; end
+
       private
         # Oracle can't compare CLOB columns with standard SQL operators for comparison.
         # We need to replace standard equality for text/binary columns to use DBMS_LOB.COMPARE function.

data/spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb

@@ -10,7 +10,7 @@ describe "OracleEnhancedAdapter emulate OracleAdapter" do
   end
 
   it "should be an OracleAdapter" do
-    @conn = ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(emulate_oracle_adapter: true))
+    @conn = ActiveRecord::Base.establish_connection(CONNECTION_PARAMS.merge(adapter: "oracle"))
     expect(ActiveRecord::Base.connection).not_to be_nil
     expect(ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::OracleAdapter)).to be_truthy
   end

data/spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb

@@ -81,7 +81,7 @@ describe "Oracle Enhanced adapter database tasks" do
     describe "structure" do
       let(:temp_file) { Tempfile.create(["oracle_enhanced", ".sql"]).path }
       before do
-        ActiveRecord::Base.connection.schema_migration.create_table
+        ActiveRecord::Base.connection_pool.schema_migration.create_table
         ActiveRecord::Base.connection.execute "INSERT INTO schema_migrations (version) VALUES ('20150101010000')"
       end
 
@@ -109,7 +109,7 @@ describe "Oracle Enhanced adapter database tasks" do
 
       after do
         File.unlink(temp_file)
-        ActiveRecord::Base.connection.schema_migration.drop_table
+        ActiveRecord::Base.connection_pool.schema_migration.drop_table
       end
     end
 

data/spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb

@@ -14,7 +14,7 @@ describe "OracleEnhancedAdapter schema dump" do
   def standard_dump(options = {})
     stream = StringIO.new
     ActiveRecord::SchemaDumper.ignore_tables = options[:ignore_tables] || []
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection_pool, stream)
     stream.string
   end
 

data/spec/active_record/connection_adapters/oracle_enhanced/schema_statements_spec.rb

@@ -1255,8 +1255,7 @@ end
 
     before do
       @conn = ActiveRecord::Base.connection
-
-      ActiveRecord::Base.connection.schema_migration.create_table
+      ActiveRecord::Base.connection_pool.schema_migration.create_table
     end
 
     context "multi insert is supported" do
@@ -1284,7 +1283,7 @@ end
     end
 
     after do
-      ActiveRecord::Base.connection.schema_migration.drop_table
+      ActiveRecord::Base.connection_pool.schema_migration.drop_table
     end
   end
 end

data/spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb

@@ -334,9 +334,9 @@ describe "OracleEnhancedAdapter structure dump" do
     let(:dump) { ActiveRecord::Base.connection.dump_schema_information }
 
     before do
-      ActiveRecord::Base.connection.schema_migration.create_table
+      ActiveRecord::Base.connection_pool.schema_migration.create_table
       versions.each do |i|
-        ActiveRecord::Base.connection.schema_migration.create_version(i)
+        ActiveRecord::Base.connection_pool.schema_migration.create_version(i)
       end
     end
 
@@ -376,7 +376,7 @@ describe "OracleEnhancedAdapter structure dump" do
     end
 
     after do
-      ActiveRecord::Base.connection.schema_migration.drop_table
+      ActiveRecord::Base.connection_pool.schema_migration.drop_table
     end
   end
 

data/spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb

@@ -354,15 +354,15 @@ describe "OracleEnhancedAdapter" do
 
     it "should explain query" do
       explain = TestPost.where(id: 1).explain
-      expect(explain).to include("Cost")
-      expect(explain).to include("INDEX UNIQUE SCAN")
+      expect(explain.inspect).to include("Cost")
+      expect(explain.inspect).to include("INDEX UNIQUE SCAN")
     end
 
     it "should explain query with binds" do
       binds = [ActiveRecord::Relation::QueryAttribute.new("id", 1, ActiveRecord::Type::OracleEnhanced::Integer.new)]
       explain = TestPost.where(id: binds).explain
-      expect(explain).to include("Cost")
-      expect(explain).to include("INDEX UNIQUE SCAN").or include("TABLE ACCESS FULL")
+      expect(explain.inspect).to include("Cost")
+      expect(explain.inspect).to include("INDEX UNIQUE SCAN").or include("TABLE ACCESS FULL")
     end
   end
 
@@ -768,13 +768,13 @@ describe "OracleEnhancedAdapter" do
     it "should explain considers hints" do
       post = TestPost.optimizer_hints("FULL (\"TEST_POSTS\")")
       post = post.where(id: 1)
-      expect(post.explain).to include("|  TABLE ACCESS FULL| TEST_POSTS |")
+      expect(post.explain.inspect).to include("|  TABLE ACCESS FULL| TEST_POSTS |")
     end
 
     it "should explain considers hints with /*+ */" do
       post = TestPost.optimizer_hints("/*+ FULL (\"TEST_POSTS\") */")
       post = post.where(id: 1)
-      expect(post.explain).to include("|  TABLE ACCESS FULL| TEST_POSTS |")
+      expect(post.explain.inspect).to include("|  TABLE ACCESS FULL| TEST_POSTS |")
     end
   end
 

data/spec/spec_helper.rb

@@ -33,9 +33,9 @@ require "active_support/log_subscriber"
 require "active_record/log_subscriber"
 
 require "logger"
+require "ruby-plsql"
 
 require "active_record/connection_adapters/oracle_enhanced_adapter"
-require "ruby-plsql"
 
 puts "==> Effective ActiveRecord version #{ActiveRecord::VERSION::STRING}"
 
@@ -133,7 +133,7 @@ module SchemaDumpingHelper
     old_ignore_tables = ActiveRecord::SchemaDumper.ignore_tables
     ActiveRecord::SchemaDumper.ignore_tables = connection.data_sources - [table]
     stream = StringIO.new
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection_pool, stream)
     stream.string
   ensure
     ActiveRecord::SchemaDumper.ignore_tables = old_ignore_tables

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.2.0.rc1
 platform: ruby
 authors:
 - Raimonds Simanovskis
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: ruby-plsql
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="