Merge pull request datamapper#150 from d11wtq/bugfix/direction-operat…

…or-precedence Change Direction/Operator precedence (fixes regression at d4377a9)
rcarver · Oct 9, 2011 · 03f14bc · 03f14bc
2 parents a5ce6f2 + e4668d1
commit 03f14bc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/dm-core/query.rb b/lib/dm-core/query.rb
@@ -1053,6 +1053,9 @@ def normalize_order
       @order = Array(@order)
       @order = @order.map do |order|
         case order
+          when Direction
+            order.dup
+
           when Operator
             target   = order.target
             property = target.kind_of?(Property) ? target : @properties[target]
@@ -1065,9 +1068,6 @@ def normalize_order
           when Property
             Direction.new(order)
 
-          when Direction
-            order.dup
-
           when Path
             Direction.new(order.property)