aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/visitors
diff options
context:
space:
mode:
authorErnie Miller <ernie@metautonomo.us>2011-06-14 17:43:22 -0400
committerErnie Miller <ernie@metautonomo.us>2011-06-15 09:18:26 -0400
commitba3578a22f824da3478b6dceb100deb9f41a56e9 (patch)
tree8caaa5ad9018fe61c838907cd0854a68a55f91cd /lib/arel/visitors
parent593002080cbcbb6e14acf3bc909aab819811f215 (diff)
downloadrails-ba3578a22f824da3478b6dceb100deb9f41a56e9.tar.gz
rails-ba3578a22f824da3478b6dceb100deb9f41a56e9.tar.bz2
rails-ba3578a22f824da3478b6dceb100deb9f41a56e9.zip
Break Ordering into Ascending/Descending nodes, allow reversal
Diffstat (limited to 'lib/arel/visitors')
-rw-r--r--lib/arel/visitors/depth_first.rb2
-rw-r--r--lib/arel/visitors/dot.rb1
-rw-r--r--lib/arel/visitors/to_sql.rb8
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/arel/visitors/depth_first.rb b/lib/arel/visitors/depth_first.rb
index 914b2d1999..6f9385de1b 100644
--- a/lib/arel/visitors/depth_first.rb
+++ b/lib/arel/visitors/depth_first.rb
@@ -22,6 +22,7 @@ module Arel
alias :visit_Arel_Nodes_Not :unary
alias :visit_Arel_Nodes_Offset :unary
alias :visit_Arel_Nodes_On :unary
+ alias :visit_Arel_Nodes_Ordering :unary
alias :visit_Arel_Nodes_Top :unary
alias :visit_Arel_Nodes_UnqualifiedColumn :unary
@@ -75,7 +76,6 @@ module Arel
alias :visit_Arel_Nodes_NotEqual :binary
alias :visit_Arel_Nodes_NotIn :binary
alias :visit_Arel_Nodes_Or :binary
- alias :visit_Arel_Nodes_Ordering :binary
alias :visit_Arel_Nodes_OuterJoin :binary
alias :visit_Arel_Nodes_TableAlias :binary
alias :visit_Arel_Nodes_Values :binary
diff --git a/lib/arel/visitors/dot.rb b/lib/arel/visitors/dot.rb
index 92d05c7b67..8303279211 100644
--- a/lib/arel/visitors/dot.rb
+++ b/lib/arel/visitors/dot.rb
@@ -30,7 +30,6 @@ module Arel
private
def visit_Arel_Nodes_Ordering o
visit_edge o, "expr"
- visit_edge o, "direction"
end
def visit_Arel_Nodes_TableAlias o
diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb
index 29e965bef8..933edc15f2 100644
--- a/lib/arel/visitors/to_sql.rb
+++ b/lib/arel/visitors/to_sql.rb
@@ -203,8 +203,12 @@ key on UpdateManager using UpdateManager#key=
"(#{visit o.expr})"
end
- def visit_Arel_Nodes_Ordering o
- "#{visit o.expr} #{o.descending? ? 'DESC' : 'ASC'}"
+ def visit_Arel_Nodes_Ascending o
+ "#{visit o.expr} ASC"
+ end
+
+ def visit_Arel_Nodes_Descending o
+ "#{visit o.expr} DESC"
end
def visit_Arel_Nodes_Group o