activerecord-oracle_enhanced-adapter-monky_patch_755 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed89ee64009f82b6c3b85f576106cb71306205bb
-  data.tar.gz: 728b4e6b58c2d5d1f1a66a5dcb6f2bcbbd254fdc
+  metadata.gz: 0a0c559f94c59c569eb24be966079815ee59926e
+  data.tar.gz: 509fdb2ae14da698151a5d9d7c13ad16e551e662
 SHA512:
-  metadata.gz: c81a4a2330511a1c98fe65e88c43ef318cdca1642944e91c1fe3ae6c98d241580d4c1806016462c0cf727c61f4c591b35b7c2af3954c41a40a29f291001ea5f4
-  data.tar.gz: b05a4425652fe1751528fd3c802e1c8ade6d3e1f98d8379cabd52c100ffe37713371b0121a73171ae99e228329289a2ba129ac6b9215b90991876ce919821fa0
+  metadata.gz: 1ffe403b46c1b0504d94dda327489a55b6148da4babbfddbf5ab3fd8e0c70bd68fc1f34549c8a93b7ded8eb22b583ab738caee59c36273d8b66bf0926f750f96
+  data.tar.gz: d65c7cd75f69a82f20e835627b75ab4d4a5cb5d7a376a5598b6e01a3f22887e2fd7c889bc6d6bfa60d072fb26228787d1b92209a5cca8a02d7db8c687b0d9373

data/README.md

@@ -24,7 +24,7 @@ $ gem install activerecord-oracle_enhanced-adapter-monky_patch_755
 
 ## Target
 
-* 'activerecord', '~>4.2.1'
+* 'activerecord', '~>4.2.1', '<=4.2.7'
 * 'activerecord-oracle_enhanced-adapter', '~> 1.6.0'
 
 ## Motivation

data/lib/activerecord-oracle_enhanced-adapter-monky_patch_755.rb

@@ -2,6 +2,7 @@ module OracleEnhanced
   class MonkeyPatch755Railtie < ::Rails::Railtie
     ActiveSupport.on_load(:active_record) do
       require 'activerecord/monkey_patch'
+      require 'activerecord/monkey_patch/rails4'
     end
   end
 end

data/lib/activerecord/monkey_patch.rb

@@ -5,9 +5,6 @@
 #
 module ActiveRecord
   module MonkeyPatch
-    MINIMUM_SUPPORTED_VERSION = '4.2.1'.freeze
-    MAXIMUM_SUPPORTED_VERSION = '4.2.7'.freeze
-
     def adjust_timezone_offset(opts)
       if ActiveRecord::Base.connection_config[:adapter] != 'oracle_enhanced' ||
         Gem::Version.create(Rails.version) < Gem::Version.create(MINIMUM_SUPPORTED_VERSION) ||
@@ -43,48 +40,4 @@ module ActiveRecord
 
     module_function :adjust_timezone_offset
   end
-
-  #
-  # Original code is the following URL.
-  #
-  #   https://github.com/rails/rails/blob/v4.2.6/activerecord/lib/active_record/relation/query_methods.rb#L947
-  #
-  module QueryMethods
-    def build_where(opts, other = [])
-      case opts
-      when String, Array
-        [@klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))]
-      when Hash
-        opts = ActiveRecord::MonkeyPatch.adjust_timezone_offset(opts)
-        opts = PredicateBuilder.resolve_column_aliases(klass, opts)
-
-        tmp_opts, bind_values = create_binds(opts)
-        self.bind_values += bind_values
-
-        attributes = @klass.send(:expand_hash_conditions_for_aggregates, tmp_opts)
-        add_relations_to_bind_values(attributes)
-
-        PredicateBuilder.build_from_hash(klass, attributes, table)
-      else
-        [opts]
-      end
-    end
-  end
-
-  #
-  # Original code is the following URL.
-  #
-  #   https://github.com/rails/rails/blob/v4.2.6/activerecord/lib/active_record/statement_cache.rb#L81
-  #
-  class StatementCache # :nodoc:
-    class BindMap # :nodoc:
-      def bind(values)
-        values = ActiveRecord::MonkeyPatch.adjust_timezone_offset(values)
-
-        bvs = @bind_values.map { |pair| pair.dup }
-        @indexes.each_with_index { |offset,i| bvs[offset][1] = values[i] }
-        bvs
-      end
-    end
-  end
 end

data/lib/activerecord/monkey_patch/rails4.rb

@@ -0,0 +1,50 @@
+module ActiveRecord
+  module MonkeyPatch
+    MINIMUM_SUPPORTED_VERSION = '4.2.1'.freeze
+    MAXIMUM_SUPPORTED_VERSION = '4.2.7.1'.freeze
+  end
+
+  #
+  # Original code is the following URL.
+  #
+  #   https://github.com/rails/rails/blob/v4.2.6/activerecord/lib/active_record/relation/query_methods.rb#L947
+  #
+  module QueryMethods
+    def build_where(opts, other = [])
+      case opts
+      when String, Array
+        [@klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))]
+      when Hash
+        opts = ActiveRecord::MonkeyPatch.adjust_timezone_offset(opts)
+        opts = PredicateBuilder.resolve_column_aliases(klass, opts)
+
+        tmp_opts, bind_values = create_binds(opts)
+        self.bind_values += bind_values
+
+        attributes = @klass.send(:expand_hash_conditions_for_aggregates, tmp_opts)
+        add_relations_to_bind_values(attributes)
+
+        PredicateBuilder.build_from_hash(klass, attributes, table)
+      else
+        [opts]
+      end
+    end
+  end
+
+  #
+  # Original code is the following URL.
+  #
+  #   https://github.com/rails/rails/blob/v4.2.6/activerecord/lib/active_record/statement_cache.rb#L81
+  #
+  class StatementCache # :nodoc:
+    class BindMap # :nodoc:
+      def bind(values)
+        values = ActiveRecord::MonkeyPatch.adjust_timezone_offset(values)
+
+        bvs = @bind_values.map { |pair| pair.dup }
+        @indexes.each_with_index { |offset,i| bvs[offset][1] = values[i] }
+        bvs
+      end
+    end
+  end
+end

data/lib/activerecord/monkey_patch/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module MonkeyPatch
-    VERSION = '0.0.2'.freeze
+    VERSION = '0.0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-oracle_enhanced-adapter-monky_patch_755
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Koichi ITO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 4.2.1
     - - "<="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 4.2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.2.1
     - - "<="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: 4.2.7.1
 - !ruby/object:Gem::Dependency
   name: activerecord-oracle_enhanced-adapter
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,7 @@ files:
 - README.md
 - lib/activerecord-oracle_enhanced-adapter-monky_patch_755.rb
 - lib/activerecord/monkey_patch.rb
+- lib/activerecord/monkey_patch/rails4.rb
 - lib/activerecord/monkey_patch/version.rb
 homepage: http://github.com/koic/oracle-enhanced-monky_patch_755
 licenses: