Use type_owner for cross-schema type lookups (fixes rsim#208)

Use argument_metadata[:type_owner] instead of @schema_name when
querying ALL_PLSQL_TYPE_ATTRS, ALL_TAB_COLUMNS, ALL_PLSQL_COLL_TYPES,
and ALL_COLL_TYPES so that types defined in another schema are
resolved correctly.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: yahonda

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,4 +4,5 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      # Check for updates to GitHub Actions every weekday
+      interval: "daily"

.github/dependabot.yml

@@ -23,32 +23,14 @@ jobs:
       - name: Build gem
         run: gem build ruby-plsql.gemspec
       - name: Upload gem artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         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 gems to RubyGems
-    needs: [build-cruby, build-jruby]
+    name: Push gem to RubyGems
+    needs: [build-cruby]
     runs-on: ubuntu-latest
     environment: rubygems
     permissions:
@@ -57,21 +39,17 @@ jobs:
       actions: read
     steps:
       - name: Download CRuby gem
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
         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 gems
+      - name: Push gem
         run: |
           for gem in *.gem; do
             echo "Pushing $gem"

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-[![Test](https://github.com/rsim/ruby-plsql/actions/workflows/test.yml/badge.svg)](https://github.com/rsim/ruby-plsql/actions/workflows/test.yml)
+[![Build Status](https://travis-ci.com/rsim/ruby-plsql.svg?branch=master)](https://travis-ci.com/rsim/ruby-plsql)
 
 ruby-plsql
 ==========
@@ -120,22 +120,6 @@ 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
@@ -151,7 +135,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.1 or higher)
+If you are using MRI Ruby implementation then you need to install ruby-oci8 gem (version 2.0.x or 2.1.x)
 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.

README.md

@@ -48,31 +48,14 @@
 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]
-      if ENV["TNS_ADMIN"] && database && database !~ %r{\A[:/]} && !params[:host] && !params[:url]
+      url = if ENV["TNS_ADMIN"] && database && !params[:host] && !params[:url]
         "jdbc:oracle:thin:@#{database}"
       else
-        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
+        database = ":#{database}" unless database.match(/^(\:|\/)/)
+        params[:url] || "jdbc:oracle:thin:@#{params[:host] || 'localhost'}:#{params[:port] || 1521}#{database}"
       end
+      new(java.sql.DriverManager.getConnection(url, params[:username], params[:password]))
     end
 
     def set_time_zone(time_zone = nil)

lib/plsql/jdbc_connection.rb

@@ -0,0 +1,25 @@
+# apply TIMESTAMP fractional seconds patch to ruby-oci8 2.0.3
+# see http://rubyforge.org/forum/forum.php?thread_id=46576&forum_id=1078
+if OCI8::VERSION == "2.0.3" &&
+  !OCI8::BindType::Util.method_defined?(:datetime_to_array_without_timestamp_patch)
+
+  OCI8::BindType::Util.module_eval do
+    alias :datetime_to_array_without_timestamp_patch :datetime_to_array
+    def datetime_to_array(val, full)
+      result = datetime_to_array_without_timestamp_patch(val, full)
+      if result && result[6] == 0
+        if val.respond_to? :nsec
+          fsec = val.nsec
+        elsif val.respond_to? :usec
+          fsec = val.usec * 1000
+        else
+          fsec = 0
+        end
+        result[6] = fsec
+      end
+      result
+    end
+    private :datetime_to_array_without_timestamp_patch, :datetime_to_array
+  end
+
+end

lib/plsql/oci8_patches.rb

@@ -14,9 +14,13 @@
   raise LoadError, "ERROR: ruby-plsql could not load ruby-oci8 library. #{msg}"
 end
 
+require "plsql/oci8_patches"
+
 # check ruby-oci8 version
-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."
+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."
 end
 
 module PLSQL

lib/plsql/oci_connection.rb

@@ -361,7 +361,7 @@ def get_field_definitions(argument_metadata) # :nodoc:
           WHERE t.OWNER = :owner AND t.type_name = :type_name AND t.package_name = :package_name
           AND ta.OWNER = t.owner AND ta.TYPE_NAME = t.TYPE_NAME AND ta.PACKAGE_NAME = t.PACKAGE_NAME
           ORDER BY attr_no",
-          @schema_name, argument_metadata[:type_name], argument_metadata[:type_subname]) do |r|
+          argument_metadata[:type_owner], argument_metadata[:type_name], argument_metadata[:type_subname]) do |r|
 
           attr_no, attr_name, attr_type_owner, attr_type_name, attr_type_package, attr_length, attr_precision, attr_scale, attr_char_used = r
 
@@ -391,9 +391,9 @@ 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_COLUMNS WHERE OWNER = :owner AND TABLE_NAME = :type_name
+           FROM ALL_TAB_COLS WHERE OWNER = :owner AND TABLE_NAME = :type_name
            ORDER BY column_id",
-          @schema_name, argument_metadata[:type_name]) do |r|
+          argument_metadata[:type_owner], argument_metadata[:type_name]) do |r|
 
           col_no, col_name, col_type_name, col_length, col_precision, col_scale, col_char_length, col_char_used = r
 
@@ -426,7 +426,7 @@ def get_element_definition(argument_metadata) # :nodoc:
             "SELECT elem_type_owner, elem_type_name, elem_type_package, length, precision, scale, char_used, index_by
              FROM ALL_PLSQL_COLL_TYPES t
              WHERE t.OWNER = :owner AND t.TYPE_NAME = :type_name AND t.PACKAGE_NAME = :package_name",
-            @schema_name, argument_metadata[:type_name], argument_metadata[:type_subname])
+            argument_metadata[:type_owner], argument_metadata[:type_name], argument_metadata[:type_subname])
 
           elem_type_owner, elem_type_name, elem_type_package, elem_length, elem_precision, elem_scale, elem_char_used, index_by = r
 
@@ -460,30 +460,13 @@ 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(
             "SELECT elem_type_owner, elem_type_name, length, precision, scale, char_used
              FROM ALL_COLL_TYPES t
              WHERE t.owner = :owner AND t.TYPE_NAME = :type_name",
-            @schema_name, argument_metadata[:type_name]
+            argument_metadata[:type_owner], argument_metadata[:type_name]
           )
           elem_type_owner, elem_type_name, elem_length, elem_precision, elem_scale, elem_char_used = r
 

lib/plsql/procedure.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)

lib/plsql/schema.rb

@@ -9,8 +9,7 @@ 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 ||
-           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
           return new(schema, variable, package, $2.strip, override_schema_name)
         end
       end