pg_party 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b833474e06e9a20278f5ad629e4c26f290baeeac56a0aa9c4ec6dc1104023393
-  data.tar.gz: 881f312c5714dc37760ef49537a5a200b46e72bace05a944890fe78dcc110f71
+  metadata.gz: 4e3cebeaa10645ddde63782d4ec7c7ae4f053cbcf1070662928585ae48a2b347
+  data.tar.gz: cc11305b51a54b8aaa55adf05c9ff2f05f1dee642f751945356ffe3531e1ed9e
 SHA512:
-  metadata.gz: 6b9a253b6fe399aa6908bc4d7a4e8625622fadf4877af642d22c52f1e52c211a89b23e4cf3d4bec94b461fc9daf4db5de23384091255a33d055872cd337f97ef
-  data.tar.gz: 8425ced0e015ceada85d6fedf1b553358a774ff39b85a0d4700c058a8747a24049e4f6d52a7d138722cb7cca3e04f75d883eed51f10df8f8ddbe88de629ead6a
+  metadata.gz: 6685b47219e38972531b0b846f09e1936eef95bcdbfbacb3275931026ce096ca8dadd79ff4a53efb1241649ef62e385c3e63185eaf4e01783ea1e9a153adc898
+  data.tar.gz: fc372ed2b040e5e275092e003306467d67f05693db203b50a3e75133e84cfa9a2c22524f892ce3a83e7d05c38abff491323c8f1778de1da3d8aa69afa05892eb

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_partition_key(:eq, value)
+        where(partition_key_arel(:eq, value))
       end
     end
 
@@ -48,9 +48,7 @@ module PgParty
           end_range
         )
       else
-        where_partition_key(:gteq, start_range).merge(
-          where_partition_key(:lt, end_range)
-        )
+        where(partition_key_arel(:gteq, start_range).and(partition_key_arel(:lt, end_range)))
       end
     end
 
@@ -146,7 +144,7 @@ module PgParty
       from(subquery, current_alias)
     end
 
-    def where_partition_key(meth, values)
+    def partition_key_arel(meth, values)
       partition_key_array = Array.wrap(partition_key)
       values = Array.wrap(values)
 
@@ -154,7 +152,7 @@ module PgParty
         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)|
+      partition_key_array.zip(values).inject(nil) do |obj, (column, value)|
         node = current_arel_table[column].send(meth, value)
 
         if obj.nil?
@@ -163,8 +161,6 @@ module PgParty
           obj.and(node)
         end
       end
-
-      where(arel_query)
     end
   end
 end

data/lib/pg_party/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_party
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Ryan Krage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
   requirement: !ruby/object:Gem::Requirement
@@ -210,14 +210,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +232,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: Migrations and model helpers for creating and managing PostgreSQL 10
   partitions
 email:
@@ -269,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="