activerecord-oracle_enhanced-adapter 5.2.3 → 5.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99ba62aedd6e50d8e73857481e9571fe6d32bcf54e63ad71efb585a41ee46de3
-  data.tar.gz: a328430116e7ff784117e6281e6ed7be5bc3df51ea9425d49cf3304bc0730ccf
+  metadata.gz: 11809784906ee64a1f23667c4d5f146f8cb53b64c653eda3774f405f6e9785fb
+  data.tar.gz: 75e8601819924d7daa14203efdf9e20fdb9199e8a38c0f9a6ecaeb14f5e52163
 SHA512:
-  metadata.gz: ec5c2229cc8ec228ae600373f107a4dd325913c7940f9668462148bda65380818ee7ac5eaf369e042c54cda30c44ad1934cd9aa0429a783c2c723869c036066b
-  data.tar.gz: 566e26dc8d096883fff8409fce90160706e1ae18f4e4779cd2f83ff58657f2a91f2e93ad552068717d242af38ed70403264b6b6bf1d87b7d354bf7c61f5309d9
+  metadata.gz: 1733956ba38e3ad5164e299964969d3da5281244596520cc2cd4d8f162765edd2f3f34cdadbb5603930b0dd0b29ae134482076d2cb8ccd3c1863a7caabb4028b
+  data.tar.gz: 79bb4b2ef4203f0cf6c93d7fd891e59f03c47f56e7e9432239729cac11f8b64db1606d0a49302f9f9458505874518113b1239542780358f1b58aeef4578f8145

data/History.md

@@ -1,3 +1,8 @@
+## 5.2.4 / 2018-11-29
+
+* Changes and bug fixes
+  * Stop using NativeException [#1666 #1761 #1762]
+
 ## 5.2.3 / 2018-08-08
 
 * Changes and bug fixes

data/VERSION

@@ -1 +1 @@
-5.2.3
+5.2.4

data/lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb

@@ -209,13 +209,9 @@ module ActiveRecord
         def ping
           exec_no_retry("select 1 from dual")
           @active = true
-        rescue NativeException => e
+        rescue Java::JavaSql::SQLException => e
           @active = false
-          if e.message =~ /^java\.sql\.SQL(Recoverable)?Exception/
-            raise OracleEnhanced::ConnectionException, e.message
-          else
-            raise
-          end
+          raise OracleEnhanced::ConnectionException, e.message
         end
 
         # Resets connection, by logging off and creating a new connection.
@@ -224,13 +220,9 @@ module ActiveRecord
           begin
             new_connection(@config)
             @active = true
-          rescue NativeException => e
+          rescue Java::JavaSql::SQLException => e
             @active = false
-            if e.message =~ /^java\.sql\.SQL(Recoverable)?Exception/
-              raise OracleEnhanced::ConnectionException, e.message
-            else
-              raise
-            end
+            raise OracleEnhanced::ConnectionException, e.message
           end
         end
 
@@ -239,8 +231,8 @@ module ActiveRecord
           should_retry = auto_retry? && autocommit?
           begin
             yield if block_given?
-          rescue NativeException => e
-            raise unless e.message =~ /^java\.sql\.SQL(Recoverable)?Exception: (Closed Connection|Io exception:|No more data to read from socket|IO Error:)/
+          rescue Java::JavaSql::SQLException => e
+            raise unless e.message =~ /^(Closed Connection|Io exception:|No more data to read from socket|IO Error:)/
             @active = false
             raise unless should_retry
             should_retry = false
@@ -455,11 +447,9 @@ module ActiveRecord
           super
         end
 
-        # Return NativeException / java.sql.SQLException error code
+        # Return java.sql.SQLException error code
         def error_code(exception)
           case exception
-          when NativeException
-            exception.cause.getErrorCode
           when Java::JavaSql::SQLException
             exception.getErrorCode
           else

data/spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb

@@ -381,7 +381,7 @@ describe "OracleEnhancedConnection" do
       ActiveRecord::Base.connection.auto_retry = false
       kill_current_session
       if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-        expect { @conn.exec("SELECT * FROM dual") }.to raise_error(NativeException)
+        expect { @conn.exec("SELECT * FROM dual") }.to raise_error(Java::JavaSql::SQLRecoverableException)
       else
         expect { @conn.exec("SELECT * FROM dual") }.to raise_error(OCIError)
       end
@@ -399,7 +399,7 @@ describe "OracleEnhancedConnection" do
       ActiveRecord::Base.connection.auto_retry = false
       kill_current_session
       if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-        expect { @conn.select("SELECT * FROM dual") }.to raise_error(NativeException)
+        expect { @conn.select("SELECT * FROM dual") }.to raise_error(Java::JavaSql::SQLRecoverableException)
       else
         expect { @conn.select("SELECT * FROM dual") }.to raise_error(OCIError)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.2.4
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -86,6 +86,7 @@ files:
 - lib/active_record/type/oracle_enhanced/timestampltz.rb
 - lib/active_record/type/oracle_enhanced/timestamptz.rb
 - lib/activerecord-oracle_enhanced-adapter.rb
+- lib/ojdbc6.jar
 - spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
@@ -139,31 +140,31 @@ signing_key:
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files:
-- spec/support/alter_system_set_open_cursors.sql
-- spec/support/alter_system_user_password.sql
-- spec/support/create_oracle_enhanced_users.sql
-- spec/spec_config.yaml.template
-- spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
-- spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/dbms_output_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/schema_statements_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/quoting_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
-- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
-- spec/active_record/oracle_enhanced/type/boolean_spec.rb
+- spec/spec_helper.rb
 - spec/active_record/oracle_enhanced/type/float_spec.rb
-- spec/active_record/oracle_enhanced/type/binary_spec.rb
+- spec/active_record/oracle_enhanced/type/text_spec.rb
 - spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
 - spec/active_record/oracle_enhanced/type/integer_spec.rb
-- spec/active_record/oracle_enhanced/type/raw_spec.rb
+- spec/active_record/oracle_enhanced/type/boolean_spec.rb
+- spec/active_record/oracle_enhanced/type/dirty_spec.rb
+- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
 - spec/active_record/oracle_enhanced/type/json_spec.rb
+- spec/active_record/oracle_enhanced/type/binary_spec.rb
+- spec/active_record/oracle_enhanced/type/raw_spec.rb
 - spec/active_record/oracle_enhanced/type/national_character_text_spec.rb
-- spec/active_record/oracle_enhanced/type/dirty_spec.rb
-- spec/active_record/oracle_enhanced/type/text_spec.rb
-- spec/spec_helper.rb
+- spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/quoting_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/structure_dump_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/schema_statements_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/database_tasks_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/dbms_output_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/context_index_spec.rb
+- spec/active_record/connection_adapters/emulation/oracle_adapter_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb
+- spec/support/create_oracle_enhanced_users.sql
+- spec/support/alter_system_user_password.sql
+- spec/support/alter_system_set_open_cursors.sql
+- spec/spec_config.yaml.template