Merge branch 'master' into rails-8-0-support

andynu · web-flow · commit b8a545483771 · 2025-06-18T08:12:21.000-04:00
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -10,28 +10,13 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-
-    env:
-      LD_LIBRARY_PATH: /opt/oracle/instantclient_23_6
-
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Ruby 3.3
+      - name: Set up Ruby 3.4
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3
-      - name: Download Oracle instant client
-        run: |
-          wget -q https://download.oracle.com/otn_software/linux/instantclient/2360000/instantclient-basic-linux.x64-23.6.0.24.10.zip
-          wget -q https://download.oracle.com/otn_software/linux/instantclient/2360000/instantclient-sdk-linux.x64-23.6.0.24.10.zip
-          wget -q https://download.oracle.com/otn_software/linux/instantclient/2360000/instantclient-sqlplus-linux.x64-23.6.0.24.10.zip
-      - name: Install Oracle instant client
-        run: |
-          sudo unzip instantclient-basic-linux.x64-23.6.0.24.10.zip -d /opt/oracle/
-          sudo unzip -o instantclient-sdk-linux.x64-23.6.0.24.10.zip -d /opt/oracle/
-          sudo unzip -o instantclient-sqlplus-linux.x64-23.6.0.24.10.zip -d /opt/oracle/
-          echo "/opt/oracle/instantclient_23_6" >> $GITHUB_PATH
+          ruby-version: 3.4
       - name: Build and run RuboCop
         run: |
-          bundle install --jobs 4 --retry 3
-          bundle exec rubocop
+          BUNDLE_ONLY=rubocop bundle install --jobs 4 --retry 3
+          BUNDLE_ONLY=rubocop bundle exec rubocop
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,8 +24,8 @@ jobs:
           '3.2',
         ]
     env:
-      ORACLE_HOME: /opt/oracle/instantclient_23_6
-      LD_LIBRARY_PATH: /opt/oracle/instantclient_23_6
+      ORACLE_HOME: /opt/oracle/instantclient_23_8
+      LD_LIBRARY_PATH: /opt/oracle/instantclient_23_8
       NLS_LANG: AMERICAN_AMERICA.AL32UTF8
       TNS_ADMIN: ./ci/network/admin
       DATABASE_NAME: FREEPDB1
@@ -55,15 +55,15 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
       - name: Download Oracle instant client
         run: |
-          wget -q https://download.oracle.com/otn_software/linux/instantclient/2360000/instantclient-basic-linux.x64-23.6.0.24.10.zip
-          wget -q https://download.oracle.com/otn_software/linux/instantclient/2360000/instantclient-sdk-linux.x64-23.6.0.24.10.zip
-          wget -q https://download.oracle.com/otn_software/linux/instantclient/2360000/instantclient-sqlplus-linux.x64-23.6.0.24.10.zip
+          wget -q https://download.oracle.com/otn_software/linux/instantclient/2380000/instantclient-basic-linux.x64-23.8.0.25.04.zip
+          wget -q https://download.oracle.com/otn_software/linux/instantclient/2380000/instantclient-sdk-linux.x64-23.8.0.25.04.zip
+          wget -q https://download.oracle.com/otn_software/linux/instantclient/2380000/instantclient-sqlplus-linux.x64-23.8.0.25.04.zip
       - name: Install Oracle instant client
         run: |
-          sudo unzip instantclient-basic-linux.x64-23.6.0.24.10.zip -d /opt/oracle/
-          sudo unzip -o instantclient-sdk-linux.x64-23.6.0.24.10.zip -d /opt/oracle/
-          sudo unzip -o instantclient-sqlplus-linux.x64-23.6.0.24.10.zip -d /opt/oracle/
-          echo "/opt/oracle/instantclient_23_6" >> $GITHUB_PATH
+          sudo unzip instantclient-basic-linux.x64-23.8.0.25.04.zip -d /opt/oracle/
+          sudo unzip -o instantclient-sdk-linux.x64-23.8.0.25.04.zip -d /opt/oracle/
+          sudo unzip -o instantclient-sqlplus-linux.x64-23.8.0.25.04.zip -d /opt/oracle/
+          echo "/opt/oracle/instantclient_23_8" >> $GITHUB_PATH
       - name: Install JDBC Driver
         run: |
           wget -q https://download.oracle.com/otn-pub/otn_software/jdbc/211/ojdbc11.jar -O ./lib/ojdbc11.jar
@@ -72,7 +72,7 @@ jobs:
           ./ci/setup_accounts.sh
       - name: Update RubyGems
         run: |
-          gem update --system || gem update --system 3.4.22
+          gem update --system
       - name: Bundle install
         run: |
           bundle install --jobs 4 --retry 3
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,10 +1,10 @@
-require:
+plugins:
   - rubocop-performance
   - rubocop-rails
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
   DisabledByDefault: true
   SuggestExtensions: false
 
diff --git a/Gemfile b/Gemfile
@@ -8,11 +8,6 @@ group :development do
   gem "rspec"
   gem "rdoc"
   gem "rake"
-  gem "rubocop", require: false
-  gem "rubocop-performance", require: false
-  gem "rubocop-rails", require: false
-  gem "rubocop-rspec", require: false
-
   gem "activerecord",   github: "rails/rails", branch: "8-0-stable"
   gem "ruby-plsql", github: "rsim/ruby-plsql", branch: "master"
 
@@ -26,3 +21,10 @@ group :development do
     gem "pry-nav"
   end
 end
+
+group :rubocop do
+  gem "rubocop", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rails", require: false
+  gem "rubocop-rspec", require: false
+end
diff --git a/History.md b/History.md
@@ -1,3 +1,19 @@
+## 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
+  * Address `add_timestamps` error [#2417, #2438]
+  * Address `rename_table` ArgumentError [#2418, #2437]
+  * Update `reconnect!` method signature [#2433, #2436]
+  * Update README.md to support status of Rails 7.1 [#2408, #2409]
+
 ## 7.1.0 / 2024-09-25
 
 * Changes and bug fixes
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.1.0.alpha
+8.0.0.alpha
diff --git a/activerecord-oracle_enhanced-adapter.gemspec b/activerecord-oracle_enhanced-adapter.gemspec
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version = version
 
   s.required_rubygems_version = ">= 1.8.11"
-  s.required_ruby_version     = ">= 2.7.0"
+  s.required_ruby_version     = ">= 3.1.0"
   s.license = "MIT"
   s.authors = ["Raimonds Simanovskis"]
   s.description = 'Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
diff --git a/lib/active_record/connection_adapters/oracle_enhanced/quoting.rb b/lib/active_record/connection_adapters/oracle_enhanced/quoting.rb
@@ -107,7 +107,6 @@ def self.mixed_case?(name)
           !!(object_name =~ /[A-Z]/ && object_name =~ /[a-z]/)
         end
 
-
         def quote_string(s) # :nodoc:
           s.gsub(/'/, "''")
         end
diff --git a/lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb b/lib/active_record/connection_adapters/oracle_enhanced/schema_statements.rb
@@ -252,7 +252,7 @@ def primary_key(*args)
           rebuild_primary_key_index_to_default_tablespace(table_name, options)
         end
 
-        def rename_table(table_name, new_name) # :nodoc:
+        def rename_table(table_name, new_name, **options) # :nodoc:
           if new_name.to_s.length > DatabaseLimits::IDENTIFIER_MAX_LENGTH
             raise ArgumentError, "New table name '#{new_name}' is too long; the limit is #{DatabaseLimits::IDENTIFIER_MAX_LENGTH} characters"
           end
@@ -261,7 +261,7 @@ def rename_table(table_name, new_name) # :nodoc:
           execute "RENAME #{quote_table_name(table_name)} TO #{quote_table_name(new_name)}"
           execute "RENAME #{quote_table_name("#{table_name}_seq")} TO #{default_sequence_name(new_name)}" rescue nil
 
-          rename_table_indexes(table_name, new_name)
+          rename_table_indexes(table_name, new_name, **options)
         end
 
         def drop_table(table_name, **options) # :nodoc:
@@ -622,6 +622,13 @@ def create_alter_table(name)
           OracleEnhanced::AlterTable.new create_table_definition(name)
         end
 
+        def add_timestamps(table_name, **options)
+          fragments = add_timestamps_for_alter(table_name, **options)
+          fragments.each do |fragment|
+            execute "ALTER TABLE #{quote_table_name(table_name)} #{fragment}"
+          end
+        end
+
         def update_table_definition(table_name, base)
           OracleEnhanced::Table.new(table_name, base)
         end
diff --git a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
@@ -452,7 +452,7 @@ def reconnect
       end
 
       # Reconnects to the database.
-      def reconnect! # :nodoc:
+      def reconnect!(restore_transactions: false) # :nodoc:
         super
         _connection.reset!
       rescue OracleEnhanced::ConnectionException => e
diff --git a/spec/active_record/connection_adapters/oracle_enhanced/compatibility_spec.rb b/spec/active_record/connection_adapters/oracle_enhanced/compatibility_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+describe "compatibility migrations" do
+  include SchemaSpecHelper
+
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    @conn = ActiveRecord::Base.connection
+    schema_define do
+      create_table :test_employees, force: true
+    end
+  end
+
+  after(:all) do
+    schema_define do
+      drop_table :test_employees, if_exists: true
+      drop_table :new_test_employees, if_exists: true
+    end
+  end
+
+  it "should rename table on 7_0 and below" do
+    migration = Class.new(ActiveRecord::Migration[7.0]) {
+      def change
+        rename_table :test_employees, :new_test_employees
+      end
+    }.new
+
+    migration.migrate(:up)
+    expect(@conn.table_exists?(:new_test_employees)).to be_truthy
+    expect(@conn.table_exists?(:test_employees)).not_to be_truthy
+
+    migration.migrate(:down)
+    expect(@conn.table_exists?(:new_test_employees)).not_to be_truthy
+    expect(@conn.table_exists?(:test_employees)).to be_truthy
+  end
+end
diff --git a/spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb b/spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
@@ -30,6 +30,12 @@
     expect(ActiveRecord::Base.connection).to be_active
   end
 
+  it "should be active after reconnection to database with restore_transactions: true" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.reconnect!(restore_transactions: true)
+    expect(ActiveRecord::Base.connection).to be_active
+  end
+
   it "should use database default cursor_sharing parameter value force by default" do
     # Use `SYSTEM_CONNECTION_PARAMS` to query v$parameter
     ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS)
diff --git a/spec/active_record/connection_adapters/oracle_enhanced/schema_statements_spec.rb b/spec/active_record/connection_adapters/oracle_enhanced/schema_statements_spec.rb
@@ -387,6 +387,34 @@ class ::TestEmployee < ActiveRecord::Base; end
   end
 end
 
+  describe "add timestamps" do
+    before(:each) do
+      @conn = ActiveRecord::Base.connection
+      schema_define do
+        create_table :test_employees, force: true
+      end
+      class ::TestEmployee < ActiveRecord::Base; end
+    end
+
+    after(:each) do
+      schema_define do
+        drop_table :test_employees, if_exists: true
+      end
+      Object.send(:remove_const, "TestEmployee")
+      ActiveRecord::Base.clear_cache!
+    end
+
+    it "should add created_at and updated_at" do
+      expect do
+        @conn.add_timestamps("test_employees")
+      end.not_to raise_error
+
+      TestEmployee.reset_column_information
+      expect(TestEmployee.columns_hash["created_at"]).not_to be_nil
+      expect(TestEmployee.columns_hash["updated_at"]).not_to be_nil
+    end
+  end
+
   describe "ignore options for LOB columns" do
     after(:each) do
       schema_define do
