diff --git a/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb b/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb
index 81af330e0..ae8c70e05 100644
--- a/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb
+++ b/lib/active_record/connection_adapters/oracle_enhanced/database_statements.rb
@@ -285,7 +285,7 @@ def with_retry
_connection.with_retry do
yield
rescue
- @statements.clear
+ @statements.reset # FIXME: this is unsafe. Should reset only if it is safe
raise
end
end
diff --git a/lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb b/lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb
index 39ed78e65..df5ae4ad5 100644
--- a/lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb
+++ b/lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb
@@ -248,13 +248,15 @@ def reset!
end
end
+ alias_method :reset, :reset!
+
# mark connection as dead if connection lost
def with_retry(&block)
should_retry = auto_retry? && autocommit?
begin
yield if block_given?
rescue Java::JavaSql::SQLException => e
- raise unless /^(Closed Connection|Io exception:|No more data to read from socket|IO Error:)/.match?(e.message)
+ raise unless /^(Closed Connection|Io exception:|No more data to read from socket|IO Error:|ORA-03113)/.match?(e.message)
@active = false
raise unless should_retry
should_retry = false
@@ -263,7 +265,7 @@ def with_retry(&block)
end
end
- def exec(sql)
+ def exec(sql, *_)
with_retry do
exec_no_retry(sql)
end
@@ -283,10 +285,12 @@ def exec_no_retry(sql)
s.setEscapeProcessing(false)
s.execute(sql)
true
- else
+ when /\A\s*(BEGIN)/i
s = @raw_connection.prepareStatement(sql)
s.execute
true
+ else
+ select_no_retry(sql)
end
ensure
s.close rescue nil
@@ -327,9 +331,16 @@ def bind_param(position, value)
when BigDecimal
@raw_statement.setBigDecimal(position, value)
when Java::OracleSql::BLOB
- @raw_statement.setBlob(position, value)
+ blob_value = value.getBytes(1, value.length)
+ new_blob = @raw_connection.raw_connection.createBlob()
+ new_blob.setBytes(1, blob_value)
+ @raw_statement.setBlob(position, new_blob)
when Java::OracleSql::CLOB
- @raw_statement.setClob(position, value)
+ clob_value = value.getSubString(1, value.length)
+ new_clob = @raw_connection.raw_connection.createClob()
+ sS = new_clob.java_method :setString, [Java::long, java.lang.String]
+ sS.call(1, clob_value)
+ @raw_statement.setClob(position, new_clob)
when Java::OracleSql::NCLOB
@raw_statement.setClob(position, value)
when Type::OracleEnhanced::Raw
diff --git a/lib/active_record/connection_adapters/oracle_enhanced/structure_dump.rb b/lib/active_record/connection_adapters/oracle_enhanced/structure_dump.rb
index 018921ddd..c92f87e3b 100644
--- a/lib/active_record/connection_adapters/oracle_enhanced/structure_dump.rb
+++ b/lib/active_record/connection_adapters/oracle_enhanced/structure_dump.rb
@@ -315,7 +315,13 @@ def full_drop(preserve_tables = false) # :nodoc:
def execute_structure_dump(string)
string.split(STATEMENT_TOKEN).each do |ddl|
- execute(ddl) unless ddl.blank?
+ next if ddl.blank?
+ begin
+ execute(ddl) unless ddl.blank?
+ rescue
+ puts "Failed to execute #{ddl}"
+ raise
+ end
end
end
diff --git a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
index a9b06de2a..c5e024c5c 100644
--- a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
+++ b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
@@ -844,7 +844,8 @@ module ActiveRecord
end
# Workaround for https://github.com/jruby/jruby/issues/6267
-if RUBY_ENGINE == "jruby"
+# This is for older versions of JRuby and not necessary for moderm JRuby (>9) now
+if RUBY_ENGINE == "jruby" && RUBY_VERSION.to_f < 3.0
require "jruby"
class org.jruby::RubyObjectSpace::WeakMap
diff --git a/spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb b/spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
index abf24baea..899d53fb4 100644
--- a/spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
+++ b/spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
@@ -61,14 +61,14 @@
it "should not encrypt JDBC network connection" do
if ORACLE_ENHANCED_CONNECTION == :jdbc
@conn = ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS.merge(jdbc_connect_properties: { "oracle.net.encryption_client" => "REJECTED" }))
- expect(@conn.select("SELECT COUNT(*) Records FROM v$Session_Connect_Info WHERE SID=SYS_CONTEXT('USERENV', 'SID') AND Network_Service_Banner LIKE '%Encryption service adapter%'")).to eq([{ "records" => 0 }])
+ expect(@conn.connection.execute("SELECT COUNT(*) Records FROM v$Session_Connect_Info WHERE SID=SYS_CONTEXT('USERENV', 'SID') AND Network_Service_Banner LIKE '%Encryption service adapter%'")).to eq([{ "records" => 0 }])
end
end
it "should encrypt JDBC network connection" do
if ORACLE_ENHANCED_CONNECTION == :jdbc
@conn = ActiveRecord::Base.establish_connection(SYSTEM_CONNECTION_PARAMS.merge(jdbc_connect_properties: { "oracle.net.encryption_client" => "REQUESTED" }))
- expect(@conn.select("SELECT COUNT(*) Records FROM v$Session_Connect_Info WHERE SID=SYS_CONTEXT('USERENV', 'SID') AND Network_Service_Banner LIKE '%Encryption service adapter%'")).to eq([{ "records" => 1 }])
+ expect(@conn.connection.execute("SELECT COUNT(*) Records FROM v$Session_Connect_Info WHERE SID=SYS_CONTEXT('USERENV', 'SID') AND Network_Service_Banner LIKE '%Encryption service adapter%'")).to eq([{ "records" => 1 }])
end
end
@@ -285,6 +285,7 @@ class ::Post < ActiveRecord::Base
end
it "should create new connection using :url and tnsnames alias" do
+ pending "no idea how to test connecting to other host than localhost"
params = CONNECTION_PARAMS.dup
params[:url] = "jdbc:oracle:thin:@#{DATABASE_NAME}"
params[:host] = nil