Merge branch 'pr-2471' into rails-8-1-support-akostadinov

andynu · andynu · commit b36a5d4a7ac8 · 2025-10-23T15:18:38.000-04:00
# Conflicts:
#	Gemfile
#	VERSION
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -0,0 +1,36 @@
+FROM mcr.microsoft.com/devcontainers/ruby:1-3.4-bookworm
+
+# Install libaio1 (required for Oracle Instant Client)
+RUN apt-get update && apt-get install -y libaio1 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create directory structure for Oracle
+RUN mkdir -p /opt/oracle
+
+# Download and install Oracle Instant Client based on architecture
+WORKDIR /tmp
+RUN ARCH=$(uname -m) && \
+    if [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then \
+        ARCH_SUFFIX="arm64"; \
+    else \
+        ARCH_SUFFIX="x64"; \
+    fi && \
+    wget -q https://download.oracle.com/otn_software/linux/instantclient/2380000/instantclient-basic-linux.${ARCH_SUFFIX}-23.8.0.25.04.zip \
+    && wget -q https://download.oracle.com/otn_software/linux/instantclient/2380000/instantclient-sdk-linux.${ARCH_SUFFIX}-23.8.0.25.04.zip \
+    && wget -q https://download.oracle.com/otn_software/linux/instantclient/2380000/instantclient-sqlplus-linux.${ARCH_SUFFIX}-23.8.0.25.04.zip \
+    && unzip -qo instantclient-basic-linux.${ARCH_SUFFIX}-23.8.0.25.04.zip \
+    && unzip -qo instantclient-sdk-linux.${ARCH_SUFFIX}-23.8.0.25.04.zip \
+    && unzip -qo instantclient-sqlplus-linux.${ARCH_SUFFIX}-23.8.0.25.04.zip \
+    && mv instantclient_23_8 /opt/oracle/instantclient \
+    && rm -f instantclient-*.zip
+
+# Set Oracle environment variables
+ENV ORACLE_HOME=/opt/oracle/instantclient \
+    LD_LIBRARY_PATH=/opt/oracle/instantclient:$LD_LIBRARY_PATH \
+    PATH=/opt/oracle/instantclient:$PATH
+
+# Switch to vscode user
+USER vscode
+
+# Set working directory
+WORKDIR /workspaces/oracle-enhanced
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,25 @@
+{
+  "name": "Oracle Enhanced ActiveRecord Adapter",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspaces/oracle-enhanced",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "shopify.ruby-lsp"
+      ]
+    }
+  },
+  "postCreateCommand": "bundle install",
+  "remoteEnv": {
+    "DATABASE_NAME": "FREEPDB1",
+    "DATABASE_SYS_PASSWORD": "Oracle18",
+    "NLS_LANG": "American_America.AL32UTF8",
+    "TNS_ADMIN": "/workspaces/oracle-enhanced/ci/network/admin",
+    "TWO_TASK": "FREEPDB1"
+  },
+  "remoteUser": "vscode",
+  "mounts": [
+    "source=${localWorkspaceFolder}/.bundle,target=/home/vscode/.bundle,type=bind,consistency=delegated"
+  ]
+}
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -0,0 +1,28 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ../..:/workspaces:cached
+    command: sleep infinity
+    network_mode: service:oracle
+
+  oracle:
+    image: gvenzl/oracle-free:latest
+    ports:
+      - "1521:1521"
+    environment:
+      TZ: Europe/Riga
+      ORACLE_PASSWORD: Oracle18
+    healthcheck:
+      test: ["CMD", "healthcheck.sh"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+    volumes:
+      - oracle-data:/opt/oracle/oradata
+      - ../spec/support/create_oracle_enhanced_users.sql:/container-entrypoint-initdb.d/01-create-users.sql
+
+volumes:
+  oracle-data:
diff --git a/.github/workflows/ruby_head.yml b/.github/workflows/ruby_head.yml
@@ -73,6 +73,9 @@ jobs:
       - name: Bundle install
         run: |
           bundle install --jobs 4 --retry 3
+      - name: Show Gemfile.lock
+        run: |
+          cat Gemfile.lock
       - name: Run RSpec
         run: |
           bundle exec rspec
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -79,6 +79,9 @@ jobs:
       - name: Bundle install
         run: |
           bundle install --jobs 4 --retry 3
+      - name: Show Gemfile.lock
+        run: |
+          cat Gemfile.lock
       - name: Run RSpec
         run: |
           bundle exec rspec
diff --git a/.github/workflows/test_11g.yml b/.github/workflows/test_11g.yml
@@ -83,6 +83,9 @@ jobs:
       - name: Bundle install
         run: |
           bundle install --jobs 4 --retry 3
+      - name: Show Gemfile.lock
+        run: |
+          cat Gemfile.lock
       - name: Run RSpec
         run: |
           bundle exec rspec
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,7 @@ install:
   - bundle install
 
 script:
-  - bundle exec rake spec
+  - bundle exec rspec spec/active_record/oracle_enhanced/type/timestamp_spec.rb
 
 language: ruby
 rvm:
diff --git a/README.md b/README.md
@@ -833,6 +833,70 @@ complete.
 
 See the **Timeouts** section above.
 
+Development with Devcontainer
+------------------------------
+
+This project includes a devcontainer configuration that provides a complete development environment with Oracle Database and all necessary dependencies pre-configured. The devcontainer supports both x64 and ARM64 architectures.
+
+### Prerequisites
+
+- [Docker](https://www.docker.com/get-started) installed and running
+- [VS Code](https://code.visualstudio.com/) with the [Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers)
+
+### Getting Started
+
+1. Clone the repository:
+   ```bash
+   git clone https://github.com/rsim/oracle-enhanced.git
+   cd oracle-enhanced
+   ```
+
+2. Open the project in VS Code:
+   ```bash
+   code .
+   ```
+
+3. When prompted, click "Reopen in Container" or use the Command Palette (`Ctrl+Shift+P` / `Cmd+Shift+P`) and select "Dev Containers: Reopen in Container"
+
+4. VS Code will build and start the development environment automatically. This includes:
+   - Ruby 3.4
+   - Oracle Database Free
+   - Oracle Instant Client 23.8
+   - All required gems installed via `bundle install`
+
+### What's Included
+
+The devcontainer provides:
+
+- **Ruby**: 3.4
+- **Oracle Database**: Oracle Database Free (23c)
+- **Oracle Instant Client**: Version 23.8
+- **Database Configuration**:
+  - Database: `FREEPDB1`
+  - System password: `Oracle18`
+  - TNS configuration in `ci/network/admin`
+
+### Database Access
+
+The Oracle database is automatically started and configured with:
+- Port: `1521` (forwarded from container)
+- Service Name: `FREEPDB1`
+- System Password: `Oracle18`
+- Test users are created automatically from `spec/support/create_oracle_enhanced_users.sql`
+
+
+### Running Tests
+
+Once the devcontainer is running, you can run tests directly:
+
+```bash
+# Run all tests
+bundle exec rspec
+
+# Run specific test files
+bundle exec rspec spec/test_file_spec.rb
+```
+
 RUNNING TESTS
 -------------
 
diff --git a/RUNNING_TESTS.md b/RUNNING_TESTS.md
@@ -110,3 +110,7 @@ If no Oracle database with SYS and SYSTEM user access is available, try the dock
   ```sh
   bundle exec rake spec
   ```
+
+# Troubleshooting
+
+If you observe strange errors when running tests, make sure the activerecord version loaded by the tests is the expected one for the oracle_enhanced version.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.0.0
+8.1.0.alpha
diff --git a/activerecord-oracle_enhanced-adapter.gemspec b/activerecord-oracle_enhanced-adapter.gemspec
@@ -26,7 +26,7 @@ This adapter is superset of original ActiveRecord Oracle adapter.
     "rubygems_mfa_required" => "true"
   }
 
-  s.add_runtime_dependency("activerecord", ["~> 8.0.0"])
+  s.add_runtime_dependency("activerecord", ["~> 8.1.0.alpha"])
   s.add_runtime_dependency("ruby-plsql", [">= 0.6.0"])
   if /java/.match?(RUBY_PLATFORM)
     s.platform = Gem::Platform.new("java")
diff --git a/lib/active_record/connection_adapters/oracle_enhanced/column.rb b/lib/active_record/connection_adapters/oracle_enhanced/column.rb
@@ -6,8 +6,8 @@ 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:
-          super(name, default, sql_type_metadata, null, comment: comment)
+        def initialize(name, cast_type, default, sql_type_metadata = nil, null = true, comment: nil) # :nodoc:
+          super(name, cast_type, default, sql_type_metadata, null, comment: comment)
         end
 
         def virtual?
diff --git a/lib/active_record/connection_adapters/oracle_enhanced/schema_creation.rb b/lib/active_record/connection_adapters/oracle_enhanced/schema_creation.rb
@@ -12,6 +12,7 @@ def visit_ColumnDefinition(o)
                 @lob_tablespaces[o.name] = tablespace
               end
             end
+            o.cast_type = lookup_cast_type(sql_type)
             super
           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
@@ -284,7 +284,7 @@ def insert_versions_sql(versions) # :nodoc:
             } << "SELECT * FROM DUAL\n"
           else
             if versions.is_a?(Array)
-              # called from ActiveRecord::Base.connection#dump_schema_information
+              # called from ActiveRecord::Base.connection#dump_schema_versions
               versions.map { |version|
                 "INSERT INTO #{sm_table} (version) VALUES (#{quote(version)})"
               }.join("\n\n/\n\n")
@@ -674,6 +674,7 @@ def new_column_from_field(table_name, field, definitions)
             default_value = extract_value_from_default(field["data_default"])
             default_value = nil if is_virtual
             OracleEnhanced::Column.new(oracle_downcase(field["name"]),
+                             lookup_cast_type(field["sql_type"]),
                              default_value,
                              type_metadata,
                              field["nullable"] == "Y",
@@ -698,7 +699,7 @@ def tablespace_for(obj_type, tablespace_option, table_name = nil, column_name =
           end
 
           def default_tablespace_for(type)
-            (default_tablespaces[type] || default_tablespaces[native_database_types[type][:name]]) rescue nil
+            default_tablespaces[type]
           end
 
           def column_for(table_name, column_name)
diff --git a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
@@ -410,7 +410,7 @@ def supports_longer_identifier?
       # :startdoc:
 
       def native_database_types # :nodoc:
-        emulate_booleans_from_strings ? NATIVE_DATABASE_TYPES_BOOLEAN_STRINGS : NATIVE_DATABASE_TYPES
+        self.class.native_database_types
       end
 
       # CONNECTION MANAGEMENT ====================================
@@ -670,7 +670,7 @@ def columns_for_distinct(columns, orders) # :nodoc:
             # remove any ASC/DESC modifiers
             s.gsub(/\s+(ASC|DESC)\s*?/i, "")
           }.reject(&:blank?).map.with_index { |column, i|
-            "FIRST_VALUE(#{column}) OVER (PARTITION BY #{columns} ORDER BY #{column}) AS alias_#{i}__"
+            "FIRST_VALUE(#{column}) OVER (PARTITION BY #{columns.join(', ')} ORDER BY #{column}) AS alias_#{i}__"
           }
         (order_columns << super).join(", ")
       end
@@ -711,6 +711,10 @@ def check_version
       end
 
       class << self
+        def native_database_types
+          emulate_booleans_from_strings ? NATIVE_DATABASE_TYPES_BOOLEAN_STRINGS : NATIVE_DATABASE_TYPES
+        end
+
         def type_map
           @type_map ||= Type::TypeMap.new.tap { |m| initialize_type_map(m) }
           @type_map
diff --git a/spec/active_record/connection_adapters/oracle_enhanced/composite_spec.rb b/spec/active_record/connection_adapters/oracle_enhanced/composite_spec.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+describe "OracleEnhancedAdapter should support composite primary" do
+  include SchemaSpecHelper
+
+  before(:all) do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    schema_define do
+      create_table :test_authors, force: true do |t|
+        t.string    :first_name,    limit: 20
+        t.string    :last_name,     limit: 25
+      end
+
+      create_table :test_books, force: true do |t|
+        t.string    :title,       limit: 20
+      end
+
+      create_table :test_authors_test_books, primary_key: ["test_author_id", "test_book_id"], force: true do |t|
+        t.integer "test_author_id", precision: 38, null: false
+        t.integer "test_book_id", precision: 38, null: false
+      end
+    end
+  end
+
+  after(:all) do
+    schema_define do
+      drop_table :test_authors
+      drop_table :test_books
+      drop_table :test_authors_test_books
+    end
+  end
+
+  before(:each) do
+    class ::TestAuthor < ActiveRecord::Base
+      has_many :test_authors_test_books
+      has_many :test_books, through: :test_authors_test_books, inverse_of: :test_authors
+    end
+    class ::TestBook < ActiveRecord::Base
+      has_many :test_authors_test_books
+      has_many :test_authors, through: :test_authors_test_books, inverse_of: :test_books
+    end
+    class ::TestAuthorsTestBook < ActiveRecord::Base
+      self.primary_key = [:test_author_id, :test_book_id]
+      belongs_to :test_author, foreign_key: :test_author_id
+      belongs_to :test_book, foreign_key: :test_book_id
+    end
+
+    @author = TestAuthor.create!(
+      first_name: "First",
+      last_name: "Last",
+    )
+    @book = TestBook.create!(title: "Nice book")
+    @testRel = TestAuthorsTestBook.create!(test_author: @author, test_book: @book)
+    expect([@book]).to eq(@author.test_books)
+  end
+
+  after(:each) do
+    TestAuthor.delete_all
+    TestBook.delete_all
+    TestAuthorsTestBook.delete_all
+    Object.send(:remove_const, "TestAuthor")
+    Object.send(:remove_const, "TestBook")
+    Object.send(:remove_const, "TestAuthorsTestBook")
+    ActiveRecord::Base.clear_cache!
+  end
+
+  it "should support distinct" do
+    TestAuthor.distinct.count.should == 1
+    skip "this appears to be a rails bug https://github.com/rails/rails/issues/55401"
+    TestAuthorsTestBook.distinct.count.should == 1
+  end
+
+  it "should support includes when requesting the first record by a referenced composite idx association" do
+    expect([@book]).to eq(@author.test_books)
+    expect(TestAuthor.includes(:test_authors_test_books).references(:test_authors_test_books).merge(TestAuthorsTestBook.where(test_author: @author)).take).to eq(@author)
+    expect(TestAuthor.includes(:test_authors_test_books).references(:test_authors_test_books).merge(TestAuthorsTestBook.where(test_author: @author)).first).to eq(@author)
+  end
+
+  it "should support includes when requesting the first record by a referenced association" do
+    expect([@book]).to eq(@author.test_books)
+    expect(TestAuthorsTestBook.includes(:test_author).references(:test_author).merge(TestAuthor.where(first_name: "First")).take).to eq(@testRel)
+    expect(TestAuthorsTestBook.includes(:test_author).references(:test_author).merge(TestAuthor.where(first_name: "First")).first).to eq(@testRel)
+  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
diff --git a/spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb b/spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb
diff --git a/spec/active_record/oracle_enhanced/type/integer_spec.rb b/spec/active_record/oracle_enhanced/type/integer_spec.rb
diff --git a/spec/active_record/oracle_enhanced/type/national_character_string_spec.rb b/spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
