activerecord-oracle_enhanced-adapter 6.0.2 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 286bf797dd7620f403978bac9b64706d1d9b7b802e1c9126548d1a8107047a38
-  data.tar.gz: 5b0522c53cff924336c66a97ce53f8c901fe65bdc76c8a4b6cb86919a10d7abd
+  metadata.gz: 052b872f1a9b0e25deb107b79b568226bd0083f3747323b566cc61af3316004d
+  data.tar.gz: ba283f9be0de33aceb818753656a4887da42f6fd317036c9d34fa930aa8e9723
 SHA512:
-  metadata.gz: b85ac030f6c23463f469e3c861d7b221ab642e33cc9878fb1a4fcaeeefd8eaeb5c33ddbb4756600c39ee262057a9648b443e1dc9f92aac51d7374c8328379ea3
-  data.tar.gz: e476724d5b578459aa34211e2c80256027131123820c741065cbec1f8f0c49f7447fd136d86545b59660dabb0e3edd184b50c88eb96ee8419a199345db1cd226
+  metadata.gz: 9b4a606efdf65e2cc08a5e78f07a6d5d8750710f9c7660dfa116b885a151873f995472c01890e22716eaa1e74d9ee5527282c579d41c02978b525b2ea676b6b5
+  data.tar.gz: a937ae9b1fe755be2bfb2d100b0564bf25d1e6e23730947a09d06450e50431ee3c0d864f8cf472cbacc99e2a32b6b99d8cf8e959b86d04aabc75352798123c9c

data/History.md

@@ -1,3 +1,12 @@
+## 6.0.3 / 2020-06-16
+
+* Changes and bug fixes
+  * Auto retry works for other `exec_*` methods [#1976, #1981]
+  * Allow column name with function (e.g. `length(title)`) as safe SQL string [#2017, #2018]
+
+* CI
+  * CI against latest Ruby versions [#1979]
+
 ## 6.0.2 / 2019-12-25
 
 * Changes and bug fixes

data/VERSION

@@ -1 +1 @@
-6.0.2
+6.0.3

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

@@ -24,21 +24,23 @@ module ActiveRecord
           log(sql, name, binds, type_casted_binds) do
             cursor = nil
             cached = false
-            if without_prepared_statement?(binds)
-              cursor = @connection.prepare(sql)
-            else
-              unless @statements.key? sql
-                @statements[sql] = @connection.prepare(sql)
-              end
+            with_retry do
+              if without_prepared_statement?(binds)
+                cursor = @connection.prepare(sql)
+              else
+                unless @statements.key? sql
+                  @statements[sql] = @connection.prepare(sql)
+                end
 
-              cursor = @statements[sql]
+                cursor = @statements[sql]
 
-              cursor.bind_params(type_casted_binds)
+                cursor.bind_params(type_casted_binds)
 
-              cached = true
-            end
+                cached = true
+              end
 
-            cursor.exec
+              cursor.exec
+            end
 
             if (name == "EXPLAIN") && sql =~ /^EXPLAIN/
               res = true
@@ -96,29 +98,32 @@ module ActiveRecord
 
           log(sql, name, binds, type_casted_binds) do
             cached = false
+            cursor = nil
             returning_id_col = returning_id_index = nil
-            if without_prepared_statement?(binds)
-              cursor = @connection.prepare(sql)
-            else
-              unless @statements.key?(sql)
-                @statements[sql] = @connection.prepare(sql)
-              end
+            with_retry do
+              if without_prepared_statement?(binds)
+                cursor = @connection.prepare(sql)
+              else
+                unless @statements.key?(sql)
+                  @statements[sql] = @connection.prepare(sql)
+                end
+
+                cursor = @statements[sql]
 
-              cursor = @statements[sql]
+                cursor.bind_params(type_casted_binds)
 
-              cursor.bind_params(type_casted_binds)
+                if /:returning_id/.match?(sql)
+                  # it currently expects that returning_id comes last part of binds
+                  returning_id_index = binds.size
+                  cursor.bind_returning_param(returning_id_index, Integer)
+                end
 
-              if /:returning_id/.match?(sql)
-                # it currently expects that returning_id comes last part of binds
-                returning_id_index = binds.size
-                cursor.bind_returning_param(returning_id_index, Integer)
+                cached = true
               end
 
-              cached = true
+              cursor.exec_update
             end
 
-            cursor.exec_update
-
             rows = []
             if returning_id_index
               returning_id = cursor.get_returning_param(returning_id_index, Integer).to_i
@@ -134,24 +139,26 @@ module ActiveRecord
           type_casted_binds = type_casted_binds(binds)
 
           log(sql, name, binds, type_casted_binds) do
-            cached = false
-            if without_prepared_statement?(binds)
-              cursor = @connection.prepare(sql)
-            else
-              if @statements.key?(sql)
-                cursor = @statements[sql]
+            with_retry do
+              cached = false
+              if without_prepared_statement?(binds)
+                cursor = @connection.prepare(sql)
               else
-                cursor = @statements[sql] = @connection.prepare(sql)
-              end
+                if @statements.key?(sql)
+                  cursor = @statements[sql]
+                else
+                  cursor = @statements[sql] = @connection.prepare(sql)
+                end
 
-              cursor.bind_params(type_casted_binds)
+                cursor.bind_params(type_casted_binds)
 
-              cached = true
-            end
+                cached = true
+              end
 
-            res = cursor.exec_update
-            cursor.close unless cached
-            res
+              res = cursor.exec_update
+              cursor.close unless cached
+              res
+            end
           end
         end
 
@@ -263,6 +270,16 @@ module ActiveRecord
             end
           end
         end
+
+        private
+          def with_retry
+            @connection.with_retry do
+              yield
+            rescue
+              @statements.clear
+              raise
+            end
+          end
       end
     end
   end

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

@@ -97,6 +97,10 @@ module ActiveRecord
           @raw_connection.exec(sql, *bindvars, &block)
         end
 
+        def with_retry(&block)
+          @raw_connection.with_retry(&block)
+        end
+
         def prepare(sql)
           Cursor.new(self, @raw_connection.parse(sql))
         end
@@ -423,13 +427,11 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
   LOST_CONNECTION_ERROR_CODES = [ 28, 1012, 3113, 3114, 3135 ] #:nodoc:
 
   # Adds auto-recovery functionality.
-  #
-  # See: http://www.jiubao.org/ruby-oci8/api.en.html#label-11
-  def exec(sql, *bindvars, &block) #:nodoc:
+  def with_retry #:nodoc:
     should_retry = self.class.auto_retry? && autocommit?
 
     begin
-      @connection.exec(sql, *bindvars, &block)
+      yield
     rescue OCIException => e
       raise unless e.is_a?(OCIError) && LOST_CONNECTION_ERROR_CODES.include?(e.code)
       @active = false
@@ -439,5 +441,9 @@ class OCI8EnhancedAutoRecover < DelegateClass(OCI8) #:nodoc:
       retry
     end
   end
+
+  def exec(sql, *bindvars, &block) #:nodoc:
+    with_retry { @connection.exec(sql, *bindvars, &block) }
+  end
 end
 #:startdoc:

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

@@ -132,6 +132,42 @@ module ActiveRecord
           end
         end
 
+        def column_name_matcher
+          COLUMN_NAME
+        end
+
+        def column_name_with_order_matcher
+          COLUMN_NAME_WITH_ORDER
+        end
+
+        COLUMN_NAME = /
+          \A
+          (
+            (?:
+              # "table_name"."column_name" | function(one or no argument)
+              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+")) | \w+\((?:|\g<2>)\)
+            )
+            (?:(?:\s+AS)?\s+(?:\w+|"\w+"))?
+          )
+          (?:\s*,\s*\g<1>)*
+          \z
+        /ix
+
+        COLUMN_NAME_WITH_ORDER = /
+          \A
+          (
+            (?:
+              # "table_name"."column_name" | function(one or no argument)
+              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+")) | \w+\((?:|\g<2>)\)
+            )
+            (?:\s+ASC|\s+DESC)?
+            (?:\s+NULLS\s+(?:FIRST|LAST))?
+          )
+          (?:\s*,\s*\g<1>)*
+          \z
+        /ix
+        private_constant :COLUMN_NAME, :COLUMN_NAME_WITH_ORDER
+
         private
 
           def oracle_downcase(column_name)

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

@@ -387,10 +387,22 @@ describe "OracleEnhancedConnection" do
   end
 
   describe "auto reconnection" do
+    include SchemaSpecHelper
+
     before(:all) do
       ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
       @conn = ActiveRecord::Base.connection.instance_variable_get("@connection")
       @sys_conn = ActiveRecord::ConnectionAdapters::OracleEnhanced::Connection.create(SYS_CONNECTION_PARAMS)
+      schema_define do
+        create_table :posts, force: true
+      end
+      class ::Post < ActiveRecord::Base
+      end
+    end
+
+    after(:all) do
+      Object.send(:remove_const, "Post")
+      ActiveRecord::Base.clear_cache!
     end
 
     before(:each) do
@@ -440,6 +452,20 @@ describe "OracleEnhancedConnection" do
         expect { @conn.select("SELECT * FROM dual") }.to raise_error(OCIError)
       end
     end
+
+    it "should reconnect and execute query if connection is lost and auto retry is enabled" do
+      Post.create!
+      ActiveRecord::Base.connection.auto_retry = true
+      kill_current_session
+      expect(Post.take).not_to be_nil
+    end
+
+    it "should not reconnect and execute query if connection is lost and auto retry is disabled" do
+      Post.create!
+      ActiveRecord::Base.connection.auto_retry = false
+      kill_current_session
+      expect { Post.take }.to raise_error(ActiveRecord::StatementInvalid)
+    end
   end
 
   describe "describe table" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.3
 platform: ruby
 authors:
 - Raimonds Simanovskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-25 00:00:00.000000000 Z
+date: 2020-06-16 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/ojdbc8.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
@@ -140,33 +141,33 @@ signing_key:
 specification_version: 4
 summary: Oracle enhanced adapter for ActiveRecord
 test_files:
-- spec/spec_helper.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/float_spec.rb
+- spec/support/alter_system_user_password.sql
+- spec/support/create_oracle_enhanced_users.sql
+- spec/support/alter_system_set_open_cursors.sql
 - spec/active_record/oracle_enhanced/type/boolean_spec.rb
-- spec/active_record/oracle_enhanced/type/dirty_spec.rb
+- spec/active_record/oracle_enhanced/type/float_spec.rb
+- spec/active_record/oracle_enhanced/type/raw_spec.rb
+- spec/active_record/oracle_enhanced/type/national_character_string_spec.rb
 - spec/active_record/oracle_enhanced/type/binary_spec.rb
-- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
-- spec/active_record/oracle_enhanced/type/national_character_text_spec.rb
 - spec/active_record/oracle_enhanced/type/character_string_spec.rb
+- spec/active_record/oracle_enhanced/type/decimal_spec.rb
 - spec/active_record/oracle_enhanced/type/json_spec.rb
+- spec/active_record/oracle_enhanced/type/national_character_text_spec.rb
+- spec/active_record/oracle_enhanced/type/timestamp_spec.rb
+- spec/active_record/oracle_enhanced/type/dirty_spec.rb
+- spec/active_record/oracle_enhanced/type/integer_spec.rb
 - spec/active_record/oracle_enhanced/type/text_spec.rb
-- spec/active_record/oracle_enhanced/type/decimal_spec.rb
-- spec/active_record/oracle_enhanced/type/national_character_string_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/dbms_output_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/schema_dumper_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/procedures_spec.rb
-- spec/active_record/connection_adapters/oracle_enhanced/structure_dump_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/context_index_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/schema_statements_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/quoting_spec.rb
+- spec/active_record/connection_adapters/oracle_enhanced/procedures_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_data_types_spec.rb
-- spec/support/alter_system_user_password.sql
-- spec/support/create_oracle_enhanced_users.sql
-- spec/support/alter_system_set_open_cursors.sql
+- spec/spec_helper.rb
 - spec/spec_config.yaml.template