neo4j 9.0.4 → 9.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 160a03bbf616927228ed6a23603137686259a25a
-  data.tar.gz: 803ea0f8708abb56d3c2607a64ca142164cbeeb2
+  metadata.gz: 5de01449e5d4f56c3ad132aafe6f217fc71906c7
+  data.tar.gz: d09b397acdb1282df5fc8af65f49a53daacb9d3b
 SHA512:
-  metadata.gz: 2bf1e599fc2e9ca3ff1d9975f4f7c1e4f13f023a4646fa81a8fae97f0445ae8a4d4a9aad71cea5badbdd6ddff3e63b9b5dbfd88b7b6e0657ab8ce43180e78bc4
-  data.tar.gz: 5e8f15c0f8bd76ceb9503ddcfaccb5a86a42f909090af7d31ece23db3c7ec0b1bd69cfc25007369c7ef0b8e7820115a5f8a0381ba550056aa9ce3fcec854e727
+  metadata.gz: bd93f4e6401527c29e294bad829345fcffdb22543c6a3d513381b76f2f8246cecee70ed0e5607bdba46706e649dae7e3b0330284a36a6412b82fcd60273e1178
+  data.tar.gz: 2552206f837cb420430787ec44c62de1a498daa6ac689eb31f92d1b36e924efd64a3543edc86f60d559222a63a591f8ad48e692b659940946c6e02688e9525a4

data/CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [9.0.5] 2017-10-16
+
+## Fixes
+
+- Ensure `branch` and `with_association` methods propagate `distinct` (thanks @klobuczek / see #1438)
+
 ## [9.0.4] 2017-10-15
 
 ## Fixes
@@ -31,6 +37,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - By default, `enum` values are now case-insensitive (but there are local and global `_case_sensitive` options [see the docs](http://neo4jrb.readthedocs.io/en/9.0.x/ActiveNode.html#enums)) (thanks @thefliik / see #1419)
 
+## [8.3.4] 2017-10-16
+
+## Fixes
+
+- Ensure `branch` and `with_association` methods propagate `distinct` (thanks @klobuczek / see #1438)
+
 ## [8.3.3] 2017-10-15
 
 ## Fixes

data/lib/neo4j/active_node/query/query_proxy_eager_loading.rb

@@ -74,6 +74,7 @@ module Neo4j
         end
 
         def propagate_context(query_proxy)
+          super
           query_proxy.instance_variable_set('@with_associations_tree', @with_associations_tree)
         end
 
@@ -142,7 +143,7 @@ module Neo4j
 
         def query_from_association_tree
           previous_with_variables = []
-          with_associations_tree.paths.inject(query_as(identity).with(identity)) do |query, path|
+          with_associations_tree.paths.inject(query_as(identity).with(ensure_distinct(identity))) do |query, path|
             with_association_query_part(query, path, previous_with_variables).tap do
               previous_with_variables << path_name(path)
             end

data/lib/neo4j/active_node/query/query_proxy_methods.rb

@@ -47,6 +47,10 @@ module Neo4j
           end
         end
 
+        def propagate_context(query_proxy)
+          query_proxy.instance_variable_set(:@distinct, @distinct)
+        end
+
         # @return [Integer] number of nodes of this class
         def count(distinct = nil, target = nil)
           return 0 if unpersisted_start_object?

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '9.0.4'
+  VERSION = '9.0.5'
 end

data/neo4j.gemspec

@@ -41,4 +41,5 @@ A Neo4j OGM (Object-Graph-Mapper) for Ruby heavily inspired by ActiveRecord.
   s.add_development_dependency('guard-rubocop')
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('rubocop', '~> 0.49.1')
+  s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 9.0.4
+  version: 9.0.5
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.49.1
+- !ruby/object:Gem::Dependency
+  name: neo4j-rake_tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: 'A Neo4j OGM (Object-Graph-Mapper) for Ruby heavily inspired by ActiveRecord.
 
 '