partitioned 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be864b7e40e4e6c504bf98b195a564bde6d076b4
-  data.tar.gz: b79141c1dc5742385d9426f7a6fcf176844642ec
+  metadata.gz: 20a1c3b1bd4fce9f01962835c9820b238eb9fc44
+  data.tar.gz: 50f5192660e3f3abacf17cf8688f723b66a7d507
 SHA512:
-  metadata.gz: b0a74962101fbff55ae9edc9a8203088fca7aaa078b3bbac3594a03d3d3c8bb122f545cb984c5ad5a897ffbe80c557d530180cd2b0a0af5e353ba0bb469adcdc
-  data.tar.gz: 06c0780a190219771c06f27091774395eb682e126bf458dcb4cc1091a41b6ece5e3d104ed343684eae41e50259c6e7fc167e7ee40b9833b0460d16e036f7d2bb
+  metadata.gz: 5cdc1610b1a093a31146412e73438c315ff85081a8680f1143c9fa39e19ff8a7c35a67752f35b0fe924daef87b705a729c8246f88c1137e77dd4157d6092586d
+  data.tar.gz: 58f04692b45d14116d77da96b2144478ad8466cd29d0dfb88ee6107377dd215d3b2154020a9b828c951b82b26a143982e7948aa34d034d929ab4f7cfb7b930e9

data/lib/monkey_patch_activerecord.rb

@@ -28,8 +28,9 @@ module ActiveRecord
           where(using_arel_table[pk].eq(substitute))
       else
         # ****** END PARTITIONED PATCH ******
-        relation = self.class.unscoped.where(
-                                             self.class.arel_table[pk].eq(substitute))
+
+        relation = self.class.unscoped.where(self.class.arel_table[pk].eq(substitute))
+
         # ****** BEGIN PARTITIONED PATCH ******
       end
       # ****** END PARTITIONED PATCH ******
@@ -64,48 +65,22 @@ module ActiveRecord
 
     # Updates the associated record with values matching those of the instance attributes.
     # Returns the number of affected rows.
-    # NOTE(hofer): This monkeypatch intended for activerecord 4.0.  Based on this code:
-    # https://github.com/rails/rails/blob/4-0-stable/activerecord/lib/active_record/persistence.rb#L487
     def _update_record(attribute_names = @attributes.keys)
-      attributes_with_values = arel_attributes_with_values_for_update(attribute_names)
-      if attributes_with_values.empty?
+      # ****** BEGIN PARTITIONED PATCH ******
+      # NOTE(hofer): This patch ensures the columns the table is
+      # partitioned on are passed along to the update code so that the
+      # update statement runs against a child partition, not the
+      # parent table, to help with performance.
+      if self.class.respond_to?(:partition_keys)
+        attribute_names.concat self.class.partition_keys.map(&:to_s)
+        attribute_names.uniq!
+      end
+      # ****** END PARTITIONED PATCH ******
+      attributes_values = arel_attributes_with_values_for_update(attribute_names)
+      if attributes_values.empty?
         0
       else
-        klass = self.class
-        column_hash = klass.connection.schema_cache.columns_hash klass.table_name
-        db_columns_with_values = attributes_with_values.map { |attr,value|
-          real_column = column_hash[attr.name]
-          [real_column, value]
-        }
-        bind_attrs = attributes_with_values.dup
-        bind_attrs.keys.each_with_index do |column, i|
-          real_column = db_columns_with_values[i].first
-          bind_attrs[column] = klass.connection.substitute_at(real_column, i)
-        end
-
-        # ****** BEGIN PARTITIONED PATCH ******
-        if self.respond_to?(:dynamic_arel_table)
-          using_arel_table = dynamic_arel_table()
-          stmt = klass.unscoped.where(using_arel_table[klass.primary_key].eq(id_was || id)).arel.compile_update(bind_attrs)
-
-          # NOTE(hofer): The stmt variable got set up using
-          # klass.arel_table as its arel value.  So arel_table.name is
-          # what gets used to construct the update statement.  Here we
-          # set it to the specific partition name for this record so
-          # that the update gets run just on that partition, not on
-          # the parent one (which can cause performance issues).
-          begin
-            klass.arel_table.name = partition_table_name()
-            klass.connection.update stmt, 'SQL', db_columns_with_values
-          ensure
-            klass.arel_table.name = klass.table_name
-          end
-        else
-          # Original lines:
-          stmt = klass.unscoped.where(klass.arel_table[klass.primary_key].eq(id_was || id)).arel.compile_update(bind_attrs)
-          klass.connection.update stmt, 'SQL', db_columns_with_values
-        end
-        # ****** END PARTITIONED PATCH ******
+        self.class.unscoped._update_record attributes_values, id, id_was
       end
     end
 
@@ -115,9 +90,9 @@ module ActiveRecord
 
     # This method is patched to change the default behavior of select
     # to use the Relation's Arel::Table
-    def build_select(arel, selects)
-      if !selects.empty?
-        expanded_select = selects.map do |field|
+    def build_select(arel)
+      if !select_values.empty?
+        expanded_select = select_values.map do |field|
           columns_hash.key?(field.to_s) ? arel_table[field] : field
         end
         arel.project(*expanded_select)
@@ -186,5 +161,48 @@ module ActiveRecord
                   binds)
     end
 
+    # NOTE(hofer): This monkeypatch intended for activerecord 4.1.  Based on this code:
+    # https://github.com/rails/rails/blob/4-1-stable/activerecord/lib/active_record/relation.rb#L73-L88
+    # TODO(hofer): Update this for rails 4.2, looks like the monkeypatched method changes a bit.
+    def _update_record(values, id, id_was) # :nodoc:
+      substitutes, binds = substitute_values values
+
+      scope = @klass.unscoped
+
+      if @klass.finder_needs_type_condition?
+        scope.unscope!(where: @klass.inheritance_column)
+      end
+
+      # ****** BEGIN PARTITIONED PATCH ******
+      if @klass.respond_to?(:dynamic_arel_table)
+        using_arel_table = @klass.dynamic_arel_table(Hash[*values.map { |k,v| [k.name,v] }.flatten])
+        um = scope.where(using_arel_table[@klass.primary_key].eq(id_was || id)).arel.compile_update(substitutes, @klass.primary_key)
+
+        # NOTE(hofer): The um variable got set up using
+        # klass.arel_table as its arel value.  So arel_table.name is
+        # what gets used to construct the update statement.  Here we
+        # set it to the specific partition name for this record so
+        # that the update gets run just on that partition, not on the
+        # parent one (which can cause performance issues).
+        begin
+          @klass.arel_table.name = using_arel_table.name
+          @klass.connection.update(
+                                   um,
+                                   'SQL',
+                                   binds)
+        ensure
+          @klass.arel_table.name = @klass.table_name
+        end
+      else
+        # Original lines:
+        um = scope.where(@klass.arel_table[@klass.primary_key].eq(id_was || id)).arel.compile_update(substitutes, @klass.primary_key)
+
+        @klass.connection.update(
+                                 um,
+                                 'SQL',
+                                 binds)
+      end
+      # ****** END PARTITIONED PATCH ******
+    end
   end # class Relation
 end # module ActiveRecord

data/lib/partitioned/multi_level/configurator/reader.rb

@@ -5,10 +5,10 @@ module Partitioned
       # {PartitionManager} to request partitioning information froma
       # centralized source from multi level partitioned models
       class Reader < Partitioned::PartitionedBase::Configurator::Reader
-        
+
         alias :base_collect_from_collection :collect_from_collection
         alias :base_collect :collect
-        
+
         # configurator for a specific class level
         UsingConfigurator = Struct.new(:model, :sliced_class, :dsl)
 
@@ -81,7 +81,7 @@ module Partitioned
             bag
           end
         end
-        
+
         #
         # Foreign keys to create on each leaf partition.
         #
@@ -140,7 +140,11 @@ module Partitioned
             using_classes.each do |using_class|
               using_class.ancestors.each do |ancestor|
                 next if ancestor.class == Module
-                @using_configurators << UsingConfigurator.new(using_class, ancestor, ancestor::configurator_dsl) if ancestor::configurator_dsl
+
+                if ancestor.respond_to?(:configurator_dsl) && ancestor::configurator_dsl
+                  @using_configurators << UsingConfigurator.new(using_class, ancestor, ancestor::configurator_dsl)
+                end
+
                 break if ancestor == Partitioned::PartitionedBase
               end
             end

data/lib/partitioned/version.rb

@@ -1,4 +1,4 @@
 module Partitioned
   # the current version of this gem
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/partitioned.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name           = 'partitioned'
   s.version        = Partitioned::VERSION
   s.license        = 'New BSD License'
-  s.date           = '2015-10-01'
+  s.date           = '2015-10-02'
   s.summary        = "Postgres table partitioning support for ActiveRecord."
   s.description    = "A gem providing support for table partitioning in ActiveRecord. Support is available for postgres and AWS RedShift databases. Other features include child table management (creation and deletion) and bulk data creating and updating."
   s.authors        = ["Keith Gabryelski", "Aleksandr Dembskiy", "Edward Slavich"]
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'pg'
   s.add_dependency 'bulk_data_methods'
   s.add_dependency 'activerecord-redshift-adapter'
-  s.add_dependency 'activerecord', '~> 4.0.4'
-  s.add_development_dependency 'rails', '~> 4.0.4'
+  s.add_dependency 'activerecord', '~> 4.1.13'
+  s.add_development_dependency 'rails', '~> 4.1.13'
   s.add_development_dependency 'rspec-rails'
 end

data/spec/support/shared_example_spec_helper_for_time_key.rb

@@ -73,8 +73,12 @@ shared_examples_for "check that basic operations with postgres works correctly f
   context "when try to update a record with id = 1" do
 
     it "returns updated employee name" do
+      record = subject.find(1)
+      original_created_at = record.created_at
       subject.update(1, :name => 'Kevin')
-      expect(subject.find(1).name).to eq("Kevin")
+      result = subject.find(1)
+      expect(result.name).to eq "Kevin"
+      expect(result.created_at).to eq original_created_at
     end
 
   end # when try to update a record with id = 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: partitioned
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Keith Gabryelski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -74,28 +74,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.13
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.13
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement