Merge upstream/master and resolve conflicts

yahonda · claude · yahonda · commit 978222301c63 · 2026-04-13T21:18:56.000+09:00
Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Report a bug in ruby-plsql
+---
+
+### Steps to reproduce
+Provide a minimal PL/SQL and Ruby script that demonstrates the issue.
+
+### Expected behavior
+Tell us what should happen.
+
+### Actual behavior
+Tell us what happens instead.
+
+### System configuration
+**ruby-plsql version**:
+
+**Ruby version**:
+
+**Ruby on Rails version** (if applicable):
+
+**Oracle Database version** (paste the output of `select * from v$version`):
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,5 +4,4 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      # Check for updates to GitHub Actions every weekday
-      interval: "daily"
+      interval: "weekly"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,14 +23,32 @@ jobs:
       - name: Build gem
         run: gem build ruby-plsql.gemspec
       - name: Upload gem artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: gem-cruby
           path: "*.gem"
 
+  build-jruby:
+    name: Build gem (JRuby)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 'jruby-10.0.5.0'
+          rubygems: latest
+      - name: Build gem
+        run: gem build ruby-plsql.gemspec
+      - name: Upload gem artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: gem-jruby
+          path: "*.gem"
+
   release:
-    name: Push gem to RubyGems
-    needs: [build-cruby]
+    name: Push gems to RubyGems
+    needs: [build-cruby, build-jruby]
     runs-on: ubuntu-latest
     environment: rubygems
     permissions:
@@ -39,17 +57,21 @@ jobs:
       actions: read
     steps:
       - name: Download CRuby gem
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: gem-cruby
+      - name: Download JRuby gem
+        uses: actions/download-artifact@v8
+        with:
+          name: gem-jruby
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '4.0'
           rubygems: latest
       - name: Configure RubyGems credentials
         uses: rubygems/configure-rubygems-credentials@main
-      - name: Push gem
+      - name: Push gems
         run: |
           for gem in *.gem; do
             echo "Pushing $gem"
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/rsim/ruby-plsql.svg?branch=master)](https://travis-ci.com/rsim/ruby-plsql)
+[![Test](https://github.com/rsim/ruby-plsql/actions/workflows/test.yml/badge.svg)](https://github.com/rsim/ruby-plsql/actions/workflows/test.yml)
 
 ruby-plsql
 ==========
@@ -120,6 +120,22 @@ plsql.activerecord_class = ActiveRecord::Base
 and then you do not need to specify plsql.connection (this is also safer when ActiveRecord reestablishes connection to database).
 
 
+### JRuby JDBC connection:
+
+When using JRuby, the `connect!` method with `:host` and `:database` options uses the thin-style service name syntax by default:
+
+```ruby
+# Connects using service name syntax: jdbc:oracle:thin:@//localhost:1521/MYSERVICENAME
+plsql.connect! username: "hr", password: "hr", host: "localhost", database: "MYSERVICENAME"
+```
+
+If you need to connect using the legacy SID syntax (for Oracle databases older than 12c), prefix the database name with a colon:
+
+```ruby
+# Connects using SID syntax: jdbc:oracle:thin:@localhost:1521:MYSID
+plsql.connect! username: "hr", password: "hr", host: "localhost", database: ":MYSID"
+```
+
 ### Cheat Sheet:
 
 You may have a look at this [Cheat Sheet](http://cheatography.com/jgebal/cheat-sheets/ruby-plsql-cheat-sheet/) for instructions on how to use ruby-plsql
@@ -135,7 +151,7 @@ or include gem in Gemfile if using bundler.
 
 In addition install either ruby-oci8 (for MRI/YARV) or copy Oracle JDBC driver to $JRUBY_HOME/lib (for JRuby).
 
-If you are using MRI Ruby implementation then you need to install ruby-oci8 gem (version 2.0.x or 2.1.x)
+If you are using MRI Ruby implementation then you need to install ruby-oci8 gem (version 2.1 or higher)
 as well as Oracle client, e.g. [Oracle Instant Client](http://www.oracle.com/technetwork/database/features/instant-client/index-097480.html).
 
 If you are using JRuby then you need to download latest [Oracle JDBC driver](http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html) - either ojdbc7.jar for Java 8 and 7, ojdbc6.jar for Java 6, 7, 8 or ojdbc5.jar for Java 5. You can refer [the support matrix](http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-faq-090281.html#01_03) for details.
diff --git a/lib/plsql/jdbc_connection.rb b/lib/plsql/jdbc_connection.rb
@@ -48,14 +48,31 @@
 module PLSQL
   class JDBCConnection < Connection  # :nodoc:
     def self.create_raw(params)
+      url = jdbc_connection_url(params)
+      new(java.sql.DriverManager.getConnection(url, params[:username], params[:password]))
+    end
+
+    def self.jdbc_connection_url(params)
       database = params[:database]
-      url = if ENV["TNS_ADMIN"] && database && !params[:host] && !params[:url]
+      if ENV["TNS_ADMIN"] && database && database !~ %r{\A[:/]} && !params[:host] && !params[:url]
         "jdbc:oracle:thin:@#{database}"
       else
-        database = ":#{database}" unless database.match(/^(\:|\/)/)
-        params[:url] || "jdbc:oracle:thin:@#{params[:host] || 'localhost'}:#{params[:port] || 1521}#{database}"
+        return params[:url] if params[:url]
+
+        raise ArgumentError, "database or url option is required" if database.nil? || database.empty?
+
+        host = params[:host] || "localhost"
+        port = params[:port] || 1521
+
+        if database =~ /^:/
+          # SID syntax: jdbc:oracle:thin:@host:port:SID
+          "jdbc:oracle:thin:@#{host}:#{port}#{database}"
+        else
+          # service name syntax: jdbc:oracle:thin:@//host:port/service_name
+          database = "/#{database}" unless database =~ /^\//
+          "jdbc:oracle:thin:@//#{host}:#{port}#{database}"
+        end
       end
-      new(java.sql.DriverManager.getConnection(url, params[:username], params[:password]))
     end
 
     def set_time_zone(time_zone = nil)
diff --git a/lib/plsql/oci8_patches.rb b/lib/plsql/oci8_patches.rb
diff --git a/lib/plsql/oci_connection.rb b/lib/plsql/oci_connection.rb
@@ -14,13 +14,9 @@
   raise LoadError, "ERROR: ruby-plsql could not load ruby-oci8 library. #{msg}"
 end
 
-require "plsql/oci8_patches"
-
 # check ruby-oci8 version
-required_oci8_version = [2, 0, 3]
-oci8_version_ints = OCI8::VERSION.scan(/\d+/).map { |s| s.to_i }
-if (oci8_version_ints <=> required_oci8_version) < 0
-  raise LoadError, "ERROR: ruby-oci8 version #{OCI8::VERSION} is too old. Please install ruby-oci8 version #{required_oci8_version.join('.')} or later."
+if Gem::Version.new(OCI8::VERSION) < Gem::Version.new("2.1.0")
+  raise LoadError, "ERROR: ruby-oci8 version #{OCI8::VERSION} is too old. Please install ruby-oci8 version 2.1.0 or later."
 end
 
 module PLSQL
diff --git a/lib/plsql/procedure.rb b/lib/plsql/procedure.rb
@@ -391,7 +391,7 @@ def get_field_definitions(argument_metadata) # :nodoc:
       when "TABLE", "VIEW"
         @schema.select_all(
           "SELECT column_id, column_name, data_type, data_length, data_precision, data_scale, char_length, char_used
-           FROM ALL_TAB_COLS WHERE OWNER = :owner AND TABLE_NAME = :type_name
+           FROM ALL_TAB_COLUMNS WHERE OWNER = :owner AND TABLE_NAME = :type_name
            ORDER BY column_id",
           @schema_name, argument_metadata[:type_name]) do |r|
 
@@ -464,6 +464,23 @@ def get_element_definition(argument_metadata) # :nodoc:
 
           if elem_type_package != nil
             element_metadata[:fields] = get_field_definitions(element_metadata)
+          elsif elem_type_name && elem_type_name =~ /\A(.+)%ROWTYPE\z/
+            # TABLE OF table%ROWTYPE: Oracle stores elem_type_name as "TABLE_NAME%ROWTYPE"
+            rowtype_table_name = $1
+            check_owner = elem_type_owner || @schema_name
+            object_type_row = @schema.select_first(
+              "SELECT object_type FROM ALL_OBJECTS WHERE owner = :owner AND object_name = :name AND object_type IN ('TABLE', 'VIEW')",
+              check_owner, rowtype_table_name)
+            if object_type_row
+              element_metadata[:type_owner] ||= check_owner
+              element_metadata[:type_name] = rowtype_table_name
+              element_metadata[:sql_type_name] = build_sql_type_name(check_owner, nil, rowtype_table_name)
+              element_metadata[:data_type] = "PL/SQL RECORD"
+              element_metadata[:type_object_type] = object_type_row[0]
+              element_metadata[:fields] = get_field_definitions(element_metadata)
+            else
+              raise ArgumentError, "Could not resolve #{check_owner}.#{rowtype_table_name} to a table or view for #{elem_type_name}"
+            end
           end
         when "TYPE"
           r = @schema.select_first(
diff --git a/lib/plsql/schema.rb b/lib/plsql/schema.rb
@@ -41,7 +41,7 @@ def raw_connection=(raw_conn) # :nodoc:
     # or
     #
     #   plsql.connection = java.sql.DriverManager.getConnection(
-    #     "jdbc:oracle:thin:@#{database_host}:#{database_port}/#{database_service_name}",
+    #     "jdbc:oracle:thin:@//#{database_host}:#{database_port}/#{database_service_name}",
     #     database_user, database_password)
     #
     def connection=(conn)
diff --git a/lib/plsql/variable.rb b/lib/plsql/variable.rb
@@ -9,7 +9,8 @@ def find(schema, variable, package, override_schema_name = nil)
           AND type = 'PACKAGE'
           AND UPPER(text) LIKE :variable_name",
             override_schema_name || schema.schema_name, package, "%#{variable_upcase}%").each do |row|
-        if row[0] =~ /^\s*#{variable_upcase}\s+(CONSTANT\s+)?([A-Z0-9_. %]+(\([\w\s,]+\))?)\s*(NOT\s+NULL)?\s*((:=|DEFAULT).*)?;\s*(--.*)?$/i
+        if row[0] =~ /^\s*#{variable_upcase}\s+(CONSTANT\s+)?([A-Z0-9_. %]+(\([\w\s,]+\))?)\s*(NOT\s+NULL)?\s*((:=|DEFAULT).*)?;\s*(--.*)?$/i ||
+           row[0] =~ /^\s*#{variable_upcase}\s+(CONSTANT\s+)?([A-Z0-9_. %]+(\([\w\s,]+\))?)\s*(NOT\s+NULL)?\s*(:=|DEFAULT)\s*$/i
           return new(schema, variable, package, $2.strip, override_schema_name)
         end
       end
diff --git a/ruby-plsql.gemspec b/ruby-plsql.gemspec
@@ -23,5 +23,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 3.1"
   s.add_development_dependency "rspec_junit_formatter"
   s.add_development_dependency "simplecov"
-  s.add_development_dependency "ruby-oci8", "~> 2.1"
+  if RUBY_PLATFORM =~ /java/
+    s.platform = Gem::Platform.new("java")
+  else
+    s.add_runtime_dependency "ruby-oci8", "~> 2.1"
+  end
 end
diff --git a/spec/plsql/connection_spec.rb b/spec/plsql/connection_spec.rb
@@ -467,6 +467,78 @@
 
   end
 
+  describe "JDBC connection URL" do
+    it "should use service name syntax by default" do
+      url = PLSQL::JDBCConnection.jdbc_connection_url(host: "myhost", port: 1521, database: "MYSERVICENAME")
+      expect(url).to eq "jdbc:oracle:thin:@//myhost:1521/MYSERVICENAME"
+    end
+
+    it "should use default host and port when not specified" do
+      original_tns_admin = ENV.delete("TNS_ADMIN")
+      begin
+        url = PLSQL::JDBCConnection.jdbc_connection_url(database: "/MYSERVICENAME")
+        expect(url).to eq "jdbc:oracle:thin:@//localhost:1521/MYSERVICENAME"
+      ensure
+        ENV["TNS_ADMIN"] = original_tns_admin
+      end
+    end
+
+    it "should use SID syntax when database starts with colon" do
+      url = PLSQL::JDBCConnection.jdbc_connection_url(host: "myhost", port: 1521, database: ":MYSID")
+      expect(url).to eq "jdbc:oracle:thin:@myhost:1521:MYSID"
+    end
+
+    it "should use service name syntax when database starts with slash" do
+      url = PLSQL::JDBCConnection.jdbc_connection_url(host: "myhost", port: 1521, database: "/MYSERVICENAME")
+      expect(url).to eq "jdbc:oracle:thin:@//myhost:1521/MYSERVICENAME"
+    end
+
+    it "should use TNS alias when TNS_ADMIN is set and no host specified" do
+      original_tns_admin = ENV["TNS_ADMIN"]
+      ENV["TNS_ADMIN"] = "/path/to/tns"
+      begin
+        url = PLSQL::JDBCConnection.jdbc_connection_url(database: "MYALIAS")
+        expect(url).to eq "jdbc:oracle:thin:@MYALIAS"
+      ensure
+        ENV["TNS_ADMIN"] = original_tns_admin
+      end
+    end
+
+    it "should use service name syntax when TNS_ADMIN is set and database starts with slash" do
+      original_tns_admin = ENV["TNS_ADMIN"]
+      ENV["TNS_ADMIN"] = "/path/to/tns"
+      begin
+        url = PLSQL::JDBCConnection.jdbc_connection_url(database: "/MYSERVICENAME")
+        expect(url).to eq "jdbc:oracle:thin:@//localhost:1521/MYSERVICENAME"
+      ensure
+        ENV["TNS_ADMIN"] = original_tns_admin
+      end
+    end
+
+    it "should use SID syntax when TNS_ADMIN is set and database starts with colon" do
+      original_tns_admin = ENV["TNS_ADMIN"]
+      ENV["TNS_ADMIN"] = "/path/to/tns"
+      begin
+        url = PLSQL::JDBCConnection.jdbc_connection_url(database: ":MYSID")
+        expect(url).to eq "jdbc:oracle:thin:@localhost:1521:MYSID"
+      ensure
+        ENV["TNS_ADMIN"] = original_tns_admin
+      end
+    end
+
+    it "should raise ArgumentError when database and url are not provided" do
+      expect {
+        PLSQL::JDBCConnection.jdbc_connection_url(host: "myhost")
+      }.to raise_error(ArgumentError, /database or url option is required/)
+    end
+
+    it "should use custom URL when provided" do
+      custom_url = "jdbc:oracle:thin:@//custom:1522/MYSERVICENAME"
+      url = PLSQL::JDBCConnection.jdbc_connection_url(host: "myhost", database: "MYSERVICENAME", url: custom_url)
+      expect(url).to eq custom_url
+    end
+  end if defined?(JRuby)
+
   describe "logoff" do
     before(:each) do
       # restore connection before each test
diff --git a/spec/plsql/procedure_spec.rb b/spec/plsql/procedure_spec.rb
diff --git a/spec/plsql/variable_spec.rb b/spec/plsql/variable_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
diff --git a/spec/support/test_db.rb b/spec/support/test_db.rb

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ def raw_connection=(raw_conn) # :nodoc:`
`41`	`41`	`# or`
`42`	`42`	`#`
`43`	`43`	`# plsql.connection = java.sql.DriverManager.getConnection(`
`44`		`- # "jdbc:oracle:thin:@#{database_host}:#{database_port}/#{database_service_name}",`
	`44`	`+ # "jdbc:oracle:thin:@//#{database_host}:#{database_port}/#{database_service_name}",`
`45`	`45`	`# database_user, database_password)`
`46`	`46`	`#`
`47`	`47`	`def connection=(conn)`