pg_party 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de3fe17d288034fdb27f8bef0d5c01bad51f568dae6bf92d3e4d547da88b0ac
-  data.tar.gz: b67b26808b013d71a393d3cdc1bd90d5b28c3e318661df1c56ebf8098407579b
+  metadata.gz: ee226c4523ca2b7099761ad517be99938078f7977281d88920beff47396f0c51
+  data.tar.gz: 2843ee1eb9fbe92e9998d8da0a3a20dfa989fa6c6dfcf3a261b80bac0caa47da
 SHA512:
-  metadata.gz: d00eca782f9b7205a8c9bc3fd90a59c69a9e5ecefc828288c9d07ec61c94460e4344da121394aa6bb7b24d7a37a73e137b990ee504d7b78de28d7f29ac901f74
-  data.tar.gz: bc753cae774726c2edb8adad720c59b92214ecb75e1a955df8882f4a733d409c8170202dc65904547a71d8b6ecba65eed237c1d56b4c76f36d33c0ce739eff7b
+  metadata.gz: 6cb4e5e42f08dcca3ec065c5d73656b6075e5a647d60722607cb4a9ff3cfeee24a94f4048544f3442284c816e7e37fe196579b9037e1ddacaaf1136e440efd4a
+  data.tar.gz: fdb593463dace1bdcfd844cac214cb6e6489dc7cd533226b90d11e506955ff48ad959fa80320423f3485637f89e3f6dbaeec5812ec0c1f640eb2d620e91de6dc

data/README.md

@@ -351,9 +351,35 @@ SomeRangeRecord.in_partition(:some_range_records_partition_name)
 SomeListRecord.in_partition(:some_list_records_partition_name)
 ```
 
+To create _range_ partitions by month for previous, current and next months it's possible to use this example. To automate creation of partitions, run `Log.maintenance` every day with cron:
+
+```ruby
+class Log < ApplicationRecord
+  range_partition_by { '(created_at::date)' }
+
+  def self.maintenance
+    partitions = [Date.today.prev_month, Date.today, Date.today.next_month]
+
+    partitions.each do |day|
+      name = Log.partition_name_for(day)
+      next if ActiveRecord::Base.connection.table_exists?(name)
+      Log.create_partition(
+        name: name,
+        start_range: day.beginning_of_month,
+        end_range: day.next_month.beginning_of_month
+      )
+    end
+  end
+
+  def self.partition_name_for(day)
+    "logs_y#{day.year}_m#{day.month}"
+  end
+end
+```
+
 For more examples, take a look at the model integration specs:
 
-- https://github.com/rkrage/pg_party/tree/documentation/spec/integration/model
+- https://github.com/rkrage/pg_party/tree/master/spec/integration/model
 
 ## Development
 

data/lib/pg_party.rb

@@ -34,12 +34,6 @@ ActiveSupport.on_load(:active_record) do
     PgParty::Adapter::AbstractMethods
   )
 
-  require "pg_party/hacks/schema_cache"
-
-  ActiveRecord::ConnectionAdapters::SchemaCache.include(
-    PgParty::Hacks::SchemaCache
-  )
-
   require "active_record/tasks/postgresql_database_tasks"
   require "pg_party/hacks/postgresql_database_tasks"
 

data/lib/pg_party/adapter/postgresql_methods.rb

@@ -1,39 +1,40 @@
 # frozen_string_literal: true
 
 require "pg_party/adapter_decorator"
+require "ruby2_keywords"
 
 module PgParty
   module Adapter
     module PostgreSQLMethods
-      def create_range_partition(*args, &blk)
+      ruby2_keywords def create_range_partition(*args, &blk)
         PgParty::AdapterDecorator.new(self).create_range_partition(*args, &blk)
       end
 
-      def create_list_partition(*args, &blk)
+      ruby2_keywords def create_list_partition(*args, &blk)
         PgParty::AdapterDecorator.new(self).create_list_partition(*args, &blk)
       end
 
-      def create_range_partition_of(*args)
+      ruby2_keywords def create_range_partition_of(*args)
         PgParty::AdapterDecorator.new(self).create_range_partition_of(*args)
       end
 
-      def create_list_partition_of(*args)
+      ruby2_keywords def create_list_partition_of(*args)
         PgParty::AdapterDecorator.new(self).create_list_partition_of(*args)
       end
 
-      def create_table_like(*args)
+      ruby2_keywords def create_table_like(*args)
         PgParty::AdapterDecorator.new(self).create_table_like(*args)
       end
 
-      def attach_range_partition(*args)
+      ruby2_keywords def attach_range_partition(*args)
         PgParty::AdapterDecorator.new(self).attach_range_partition(*args)
       end
 
-      def attach_list_partition(*args)
+      ruby2_keywords def attach_list_partition(*args)
         PgParty::AdapterDecorator.new(self).attach_list_partition(*args)
       end
 
-      def detach_partition(*args)
+      ruby2_keywords def detach_partition(*args)
         PgParty::AdapterDecorator.new(self).detach_partition(*args)
       end
     end

data/lib/pg_party/adapter_decorator.rb

@@ -148,7 +148,7 @@ module PgParty
       if key.is_a?(Proc)
         key.call.to_s # very difficult to determine how to sanitize a complex expression
       else
-        quote_column_name(key)
+        Array.wrap(key).map(&method(:quote_column_name)).join(",")
       end
     end
 

data/lib/pg_party/model/list_methods.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
 require "pg_party/model_decorator"
+require "ruby2_keywords"
 
 module PgParty
   module Model
     module ListMethods
-      def create_partition(*args)
+      ruby2_keywords def create_partition(*args)
         PgParty::ModelDecorator.new(self).create_list_partition(*args)
       end
 
-      def partition_key_in(*args)
+      ruby2_keywords def partition_key_in(*args)
         PgParty::ModelDecorator.new(self).list_partition_key_in(*args)
       end
     end

data/lib/pg_party/model/methods.rb

@@ -5,12 +5,12 @@ require "pg_party/model_injector"
 module PgParty
   module Model
     module Methods
-      def range_partition_by(key=nil, &blk)
-        PgParty::ModelInjector.new(self, key || blk).inject_range_methods
+      def range_partition_by(*key, &blk)
+        PgParty::ModelInjector.new(self, *key, &blk).inject_range_methods
       end
 
-      def list_partition_by(key=nil, &blk)
-        PgParty::ModelInjector.new(self, key || blk).inject_list_methods
+      def list_partition_by(*key, &blk)
+        PgParty::ModelInjector.new(self, *key, &blk).inject_list_methods
       end
 
       def partitioned?

data/lib/pg_party/model/range_methods.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
 require "pg_party/model_decorator"
+require "ruby2_keywords"
 
 module PgParty
   module Model
     module RangeMethods
-      def create_partition(*args)
+      ruby2_keywords def create_partition(*args)
         PgParty::ModelDecorator.new(self).create_range_partition(*args)
       end
 
-      def partition_key_in(*args)
+      ruby2_keywords def partition_key_in(*args)
         PgParty::ModelDecorator.new(self).range_partition_key_in(*args)
       end
     end

data/lib/pg_party/model_decorator.rb

@@ -36,7 +36,7 @@ module PgParty
       if complex_partition_key
         complex_partition_key_query("(#{partition_key}) = (?)", value)
       else
-        where(current_arel_table[partition_key].eq(value))
+        where_partition_key(:eq, value)
       end
     end
 
@@ -48,9 +48,9 @@ module PgParty
           end_range
         )
       else
-        node = current_arel_table[partition_key]
-
-        where(node.gteq(start_range).and(node.lt(end_range)))
+        where_partition_key(:gteq, start_range).merge(
+          where_partition_key(:lt, end_range)
+        )
       end
     end
 
@@ -132,5 +132,26 @@ module PgParty
 
       from(subquery, current_alias)
     end
+
+    def where_partition_key(meth, values)
+      partition_key_array = Array.wrap(partition_key)
+      values = Array.wrap(values)
+
+      if partition_key_array.size != values.size
+        raise "number of provided values does not match the number of partition key columns"
+      end
+
+      arel_query = partition_key_array.zip(values).inject(nil) do |obj, (column, value)|
+        node = current_arel_table[column].send(meth, value)
+
+        if obj.nil?
+          node
+        else
+          obj.and(node)
+        end
+      end
+
+      where(arel_query)
+    end
   end
 end

data/lib/pg_party/model_injector.rb

@@ -2,9 +2,10 @@
 
 module PgParty
   class ModelInjector
-    def initialize(model, key)
+    def initialize(model, *key, &blk)
       @model = model
-      @key = key
+      @key = key.flatten.compact
+      @key_blk = blk
     end
 
     def inject_range_methods
@@ -38,11 +39,16 @@ module PgParty
         instance_predicate: false
       )
 
-      if @key.is_a?(Proc)
-        @model.partition_key = @key.call
+      if @key_blk
+        @model.partition_key = @key_blk.call
         @model.complex_partition_key = true
       else
-        @model.partition_key = @key
+        if @key.size == 1
+          @model.partition_key = @key.first
+        else
+          @model.partition_key = @key
+        end
+
         @model.complex_partition_key = false
       end
     end

data/lib/pg_party/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgParty
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_party
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Krage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -26,10 +26,24 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -182,14 +196,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +235,6 @@ files:
 - lib/pg_party/cache.rb
 - lib/pg_party/config.rb
 - lib/pg_party/hacks/postgresql_database_tasks.rb
-- lib/pg_party/hacks/schema_cache.rb
 - lib/pg_party/model/list_methods.rb
 - lib/pg_party/model/methods.rb
 - lib/pg_party/model/range_methods.rb
@@ -241,14 +254,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord PostgreSQL Partitioning

data/lib/pg_party/hacks/schema_cache.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module PgParty
-  module Hacks
-    module SchemaCache
-      def self.included(base)
-        return if base.method_defined?(:data_source_exists?)
-
-        base.send(:alias_method, :data_source_exists?, :table_exists?)
-      end
-    end
-  end
-end