pgrel 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b99f0c11a5e624145d178ed3bdb97dd9345ccad
-  data.tar.gz: 7db4f0a1086111e10ded6e6f9af923179ddc2012
+  metadata.gz: 5a4870c7384f1433c46da0d1515243c3753e928d
+  data.tar.gz: 446c7ccfd60abe33f7422cd2252dfa8d9bb47281
 SHA512:
-  metadata.gz: 4ef4b9230787c49c3ccb1b24d68113cf90b57c0ae8281e6814eb6d01c01925fc04031ee3f02e1cc09abf60386b2d3c12f6b2f46674f6b75ccc27cd34d3a08619
-  data.tar.gz: 8aaeaab12dd78aac0ad21a49b68af1a5efb83aeb261e0cfd431f24662b5f8b0dc88dcc4b93c8115b3a0d4999ddf3ca842c32d75f92270ebab7113eac31b71acf
+  metadata.gz: 39575efbbe02500b4a3534e4a188b845305911e96fbd33f01a68a7eaad0fa4185261727da4a7e9bf498f506af5ee63de9a147024f5b16b283a91776ee568346c
+  data.tar.gz: 63c370d875d0442c14a680d846cf34c7ccdb2f03ca25d061fbe6eae2772cf5bc5b2b9dcf16febb0543ffee61ec3c00c8cfd076c0e7dcea861925d2217790a05c

data/.travis.yml

@@ -11,7 +11,7 @@ before_script:
 
 matrix:
   include:
-    - rvm: 2.2.1
+    - rvm: 2.2.3
       gemfile: gemfiles/rails5.gemfile
     - rvm: 2.2.1
       gemfile: gemfiles/rails42.gemfile

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/palkan/pgrel.svg?branch=master)](https://travis-ci.org/palkan/pgrel)
+[![Gem Version](https://badge.fury.io/rb/pgrel.svg)](https://rubygems.org/gems/pgrel) [![Build Status](https://travis-ci.org/palkan/pgrel.svg?branch=master)](https://travis-ci.org/palkan/pgrel)
 
 ## Pgrel
 
@@ -25,10 +25,10 @@ Query by key value:
 
 ```ruby
 Hstore.where.store(:tags, a: 1, b: 2)
-#=> select * from hstores where tags->'a' = '1' and tags->'b' = '2'
+#=> select * from hstores where tags @> '"a"=>"1","b"=>"2"'
 
 Hstore.where.store(:tags, a: [1, 2])
-#=> select * from hstores where tags->'a' in ('1', '2')
+#=> select * from hstores where (tags @> '"a"=>"1"' or tags @> '"a"=>"2"')
 ```
 
 Keys existence:
@@ -61,14 +61,14 @@ Hstore.where.store(:tags).contained(a: 1, b: 2)
 
 All queries for Hstore also available for JSONB.
 
-**NOTE**. Querying by array value always resolves to `IN (...)` statement. 
+**NOTE**. Querying by array value always resolves to `(... or ...)` statement. 
 Thus it's impossible to query json array value, e.g.:
 
 ```ruby
 Model.create!(tags: {main: ['a', 'b']})
 
 Model.where.store(:tags, main: ['a', 'b']).empty? == true
-#=> select * from models where  tags->'main' in ('a', 'b')
+#=> select * from models where  (tags @> '{\"main\":\"a\"}' or tags @> '{\"main\":\"b\"}')
 ```
 
 Path query:

data/gemfiles/rails5.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rack', github: "rack/rack"
 gem 'arel', github: 'rails/arel'
 gem 'rails', github: 'rails/rails'
 

data/lib/pgrel/active_record/store_chain.rb

@@ -22,7 +22,7 @@ module ActiveRecord
       #   data = {a: 1}
       #   Model.store(:store).contains(data).all #=> [Model(name: 'first', ...)]
       def contains(opts)
-        update_scope "#{@store_name} @> #{type_cast(opts)}"
+        update_scope contains_clause(opts)
       end
 
       # Whether the store is contained within provided store
@@ -52,6 +52,37 @@ module ActiveRecord
         self
       end
 
+      # Query by store values.
+      # Supports array values.
+      #
+      # NOTE: This method uses "@>" (contains) operator with logic (AND/OR)
+      # and not uses "->" (value-by-key). The use of "contains" operator allows us to
+      # use GIN index effectively.
+      #
+      # Example
+      #   Model.create!(name: 'first', store: {b: 1, c: 2})
+      #   Model.create!(name: 'second', store: {b: 2, c: 3})
+      #
+      #   Model.store(:store, c: 2).all #=> [Model(name: 'first', ...)]
+      #   #=> (SQL) select * from ... where store @> '"c"=>"2"'::hstore
+      #
+      #   Model.store(:store, b: [1, 2]).size #=> 2
+      #   #=> (SQL) select * from ... where (store @> '"c"=>"1"'::hstore) or
+      #                                     (store @> '"c"=>"2"'::hstore)
+      def where(opts)
+        update_scope(
+          opts.map do |k, v|
+            case v
+            when Array
+              "(#{build_or_contains(k, v)})"
+            else
+              contains_clause(k => v)
+            end
+          end.join(' and ')
+        )
+        @scope
+      end
+
       if RAILS_5
         protected
 
@@ -66,20 +97,6 @@ module ActiveRecord
             @scope.table.type_cast_for_database(@store_name, value)
           )
         end
-
-        def where_with_prefix(prefix, opts)
-          where_clause = @scope.send(:where_clause_factory).build(opts, {})
-          predicates = where_clause.ast.children.map do |rel|
-            rel.left = to_sql_literal(prefix, rel.left)
-            rel
-          end
-          where_clause = ActiveRecord::Relation::WhereClause.new(
-            predicates,
-            where_clause.binds
-          )
-          @scope.where_clause += @inverted ? where_clause.invert : where_clause
-          @scope
-        end
       else
         protected
 
@@ -98,15 +115,6 @@ module ActiveRecord
           )
         end
 
-        def where_with_prefix(prefix, opts)
-          where_value = @scope.send(:build_where, opts).map do |rel|
-            rel.left = to_sql_literal(prefix, rel.left)
-            @inverted ? invert_arel(rel) : rel
-          end
-          @scope.where_values += where_value
-          @scope
-        end
-
         def invert_arel(rel)
           case rel
           when Arel::Nodes::In
@@ -120,6 +128,16 @@ module ActiveRecord
           end
         end
       end
+
+      private
+
+      def contains_clause(opts)
+        "#{@store_name} @> #{type_cast(opts)}"
+      end
+
+      def build_or_contains(k, vals)
+        vals.map { |v| contains_clause(k => v) }.join(' or ')
+      end
     end
 
     # Base class for key-value types of stores (hstore, jsonb)
@@ -171,6 +189,31 @@ module ActiveRecord
           "#{prefix}'#{node.name}'"
         )
       end
+
+      if RAILS_5
+        def where_with_prefix(prefix, opts)
+          where_clause = @scope.send(:where_clause_factory).build(opts, {})
+          predicates = where_clause.ast.children.map do |rel|
+            rel.left = to_sql_literal(prefix, rel.left)
+            rel
+          end
+          where_clause = ActiveRecord::Relation::WhereClause.new(
+            predicates,
+            where_clause.binds
+          )
+          @scope.where_clause += @inverted ? where_clause.invert : where_clause
+          @scope
+        end
+      else
+        def where_with_prefix(prefix, opts)
+          where_value = @scope.send(:build_where, opts).map do |rel|
+            rel.left = to_sql_literal(prefix, rel.left)
+            @inverted ? invert_arel(rel) : rel
+          end
+          @scope.where_values += where_value
+          @scope
+        end
+      end
     end
   end
 end

data/lib/pgrel/active_record/store_chain/hstore_chain.rb

@@ -2,35 +2,6 @@ module ActiveRecord
   module QueryMethods
     # Store chain for hstore columns.
     class HstoreChain < KeyStoreChain
-      # Query by store values.
-      #
-      # Supports array values.
-      #
-      # Example
-      #   Model.create!(name: 'first', store: {b: 1, c: 2})
-      #   Model.create!(name: 'second', store: {b: 2, c: 3})
-      #
-      #   Model.store(:store, c: 2).all #=> [Model(name: 'first', ...)]
-      #   Model.store(:store, b: [1, 2]).size #=> 2
-      def where(opts)
-        opts = stringify(opts)
-        where_with_prefix "#{@store_name}->", opts
-      end
-
-      private
-
-      def stringify(val)
-        case val
-        when String
-          val
-        when Array
-          val.map { |v| stringify(v) }
-        when Hash
-          Hash[val.map { |k, v| [stringify(k), stringify(v)] }]
-        else
-          val.to_s
-        end
-      end
     end
   end
 end

data/lib/pgrel/active_record/store_chain/jsonb_chain.rb

@@ -2,23 +2,7 @@ module ActiveRecord
   module QueryMethods
     # Store chain for jsonb columns.
     class JsonbChain < KeyStoreChain
-      # Query by store values.
-      # Supports array values (convert to IN statement).
-      #
-      # Example
-      #   Model.create!(name: 'first', store: {b: 1, c: 2})
-      #   Model.create!(name: 'second', store: {b: 2, c: 3})
-      #
-      #   Model.store(:store, c: 2).all #=> [Model(name: 'first', ...)]
-      #   Model.store(:store, b: [1, 2]).size #=> 2
-      def where(opts)
-        opts = flatten_json(opts)
-        where_with_prefix "#{@store_name}->", opts
-      end
-
-      # Query by quality in path.
-      #
-      # Path can be set as object or as args.
+      # Query by value in path.
       #
       # Example:
       #   Model.create!(name: 'first', store: {b: 1, c: { d: 3 } })
@@ -49,18 +33,6 @@ module ActiveRecord
 
       private
 
-      def flatten_json(val)
-        Hash[
-          val.map do |k, v|
-            if v.is_a?(Array)
-              [k, v.map { |i| ::ActiveSupport::JSON.encode(i) }]
-            else
-              [k, ::ActiveSupport::JSON.encode(v)]
-            end
-          end
-        ]
-      end
-
       def flatten_hash(hash)
         case hash
         when Hash

data/lib/pgrel/version.rb

@@ -1,3 +1,3 @@
 module Pgrel # :nodoc:
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/pgrel/hstore_spec.rb

@@ -116,7 +116,8 @@ describe Hstore do
 
   context '#not' do
     it '#where' do
-      expect(Hstore.where.store(:tags).not(a: 1, g: 'c').size).to eq 1
+      expect(Hstore.where.store(:tags).not(a: 2).size).to eq 4
+      expect(Hstore.where.store(:tags).not(a: 1, g: 'c').size).to eq 6
     end
 
     it '#any' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgrel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ActiveRecord extension for querying hstore and jsonb.