neo4j 9.1.1 → 9.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ce0613b4a45d089b70606742813dfbabb3714b5
-  data.tar.gz: dee160a259043e930080bad2e04c063c2978a26f
+  metadata.gz: 357d7d905619778fedfbf148a40164b44273fc46
+  data.tar.gz: 772c939f9f73395d9f5f599500c5cfeb284d5c2f
 SHA512:
-  metadata.gz: 19196cfc3b3cd6d01416ec6ecf9a5cdce925fb55c7c6e7f15d7ef9748d14c433b652b7743c729e8f2afc9b47b8e904c0d3d7df016a8602b5c87cd9ce90b78d9d
-  data.tar.gz: 507a7ae74e8ef51c885afa65e778ee00614d34f2b3166faefc8c92c31f1f8f77619cea8b84752024f284d2edf93a54514594a3720882a7d0bf73894d260310f9
+  metadata.gz: 1183dd88f10aba61c3901d8358cfce1cc75a66f2d60f2697f9d18698c70d0a1f8b2a9e782a53bb78a6e92444419afa97cbfd9e143918cc2e2b937a9ec8c03758
+  data.tar.gz: b953fee710b55a6e150e2c168ca990b6daeb65da925217a15f940cf71b25805c3b9e472b5b98ec0a6356857b5f8352c48213d13895cb54337d6fad3ba87b66ff

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.1.2] 2017-12-18
+
+## Fixed
+
+- Issue where the order of `ORDER BY` was from `.order` method was not being respected for chains with `with_association` (thanks @klobuczek / see #1454)
+
 ## [9.1.1] 2017-12-12
 
 ## Fixed

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

@@ -95,13 +95,16 @@ module Neo4j
         #
         #   student.lessons.query_as(:l).with('your cypher here...')
         def query_as(var, with_labels = true)
-          result_query = @chain.inject(base_query(var, with_labels).params(@params)) do |query, link|
+          query_from_chain(chain, base_query(var, with_labels).params(@params), var)
+            .tap { |query| query.proxy_chain_level = _chain_level }
+        end
+
+        def query_from_chain(chain, base_query, var)
+          chain.inject(base_query) do |query, link|
             args = link.args(var, rel_var)
 
             args.is_a?(Array) ? query.send(link.clause, *args) : query.send(link.clause, args)
           end
-
-          result_query.tap { |query| query.proxy_chain_level = _chain_level }
         end
 
         def base_query(var, with_labels = true)

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

@@ -46,9 +46,7 @@ module Neo4j
         end
 
         def pluck_vars(node, rel)
-          return super if with_associations_tree.size.zero?
-
-          perform_query
+          with_associations_tree.empty? ? super : perform_query
         end
 
         def perform_query
@@ -143,11 +141,13 @@ module Neo4j
 
         def query_from_association_tree
           previous_with_variables = []
-          with_associations_tree.paths.inject(query_as(identity).with(ensure_distinct(identity))) do |query, path|
+          no_order_query = 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
-          end.pluck(identity, "[#{with_associations_return_clause}]")
+          end
+          query_from_chain(@order_chain, no_order_query, identity)
+            .pluck(identity, "[#{with_associations_return_clause}]")
         end
 
         def with_association_query_part(base_query, path, previous_with_variables)
@@ -176,6 +176,12 @@ module Neo4j
         def relationship_part(association, path_name)
           "#{association.arrow_cypher(escape("#{path_name}_rel"))}(#{escape(path_name)})"
         end
+
+        def chain
+          @order_chain, other_chain =
+            with_associations_tree.empty? ? [[], @chain] : @chain.partition { |link| link.clause == :order }
+          other_chain
+        end
       end
     end
   end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '9.1.1'
+  VERSION = '9.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 9.1.1
+  version: 9.1.2
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter