aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/engines
diff options
context:
space:
mode:
Diffstat (limited to 'lib/arel/engines')
-rw-r--r--lib/arel/engines/memory/primitives.rb14
-rw-r--r--lib/arel/engines/memory/relations.rb1
-rw-r--r--lib/arel/engines/memory/relations/compound.rb5
-rw-r--r--lib/arel/engines/memory/relations/operations.rb33
-rw-r--r--lib/arel/engines/sql/formatters.rb6
-rw-r--r--lib/arel/engines/sql/primitives.rb14
-rw-r--r--lib/arel/engines/sql/relations/utilities/compound.rb2
7 files changed, 71 insertions, 4 deletions
diff --git a/lib/arel/engines/memory/primitives.rb b/lib/arel/engines/memory/primitives.rb
index 77d4c1a52c..f8bbcedb55 100644
--- a/lib/arel/engines/memory/primitives.rb
+++ b/lib/arel/engines/memory/primitives.rb
@@ -10,4 +10,18 @@ module Arel
value
end
end
+
+ class Ordering
+ def eval(row1, row2)
+ (attribute.eval(row1) <=> attribute.eval(row2)) * direction
+ end
+ end
+
+ class Descending < Ordering
+ def direction; -1 end
+ end
+
+ class Ascending < Ordering
+ def direction; 1 end
+ end
end \ No newline at end of file
diff --git a/lib/arel/engines/memory/relations.rb b/lib/arel/engines/memory/relations.rb
index 9f8264c439..1b009537b9 100644
--- a/lib/arel/engines/memory/relations.rb
+++ b/lib/arel/engines/memory/relations.rb
@@ -1,3 +1,4 @@
require 'arel/engines/memory/relations/array'
require 'arel/engines/memory/relations/operations'
+require 'arel/engines/memory/relations/compound'
diff --git a/lib/arel/engines/memory/relations/compound.rb b/lib/arel/engines/memory/relations/compound.rb
new file mode 100644
index 0000000000..b029082d57
--- /dev/null
+++ b/lib/arel/engines/memory/relations/compound.rb
@@ -0,0 +1,5 @@
+module Arel
+ class Compound < Relation
+ delegate :array, :to => :relation
+ end
+end
diff --git a/lib/arel/engines/memory/relations/operations.rb b/lib/arel/engines/memory/relations/operations.rb
index eb11fb55fd..115df054df 100644
--- a/lib/arel/engines/memory/relations/operations.rb
+++ b/lib/arel/engines/memory/relations/operations.rb
@@ -4,4 +4,37 @@ module Arel
relation.eval.select { |row| predicate.eval(row) }
end
end
+
+ class Order < Compound
+ def eval
+ relation.eval.sort do |row1, row2|
+ ordering = orderings.detect { |o| o.eval(row1, row2) != 0 } || orderings.last
+ ordering.eval(row1, row2)
+ end
+ end
+ end
+
+ class Project < Compound
+ def eval
+ relation.eval.collect { |r| r.slice(*projections) }
+ end
+ end
+
+ class Take < Compound
+ def eval
+ relation.eval[0, taken]
+ end
+ end
+
+ class Skip < Compound
+ def eval
+ relation.eval[skipped..-1]
+ end
+ end
+
+ class Group < Compound
+ def eval
+ raise NotImplementedError
+ end
+ end
end \ No newline at end of file
diff --git a/lib/arel/engines/sql/formatters.rb b/lib/arel/engines/sql/formatters.rb
index f82ddf631f..bc5f0f7c64 100644
--- a/lib/arel/engines/sql/formatters.rb
+++ b/lib/arel/engines/sql/formatters.rb
@@ -47,9 +47,9 @@ module Arel
class WhereClause < PassThrough
end
- class OrderClause < PassThrough
- def attribute(attribute)
- "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}"
+ class OrderClause < PassThrough
+ def ordering(ordering)
+ "#{quote_table_name(name_for(ordering.attribute.original_relation))}.#{quote_column_name(ordering.attribute.name)} #{ordering.direction_sql}"
end
end
diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
index 6f89723afe..9e9143ac0f 100644
--- a/lib/arel/engines/sql/primitives.rb
+++ b/lib/arel/engines/sql/primitives.rb
@@ -24,6 +24,20 @@ module Arel
object.to_sql(Sql::Value.new(relation))
end
end
+
+ class Ordering
+ def to_sql(formatter = Sql::OrderClause.new(relation))
+ formatter.ordering self
+ end
+ end
+
+ class Ascending < Ordering
+ def direction_sql; 'ASC' end
+ end
+
+ class Descending < Ordering
+ def direction_sql; 'DESC' end
+ end
class Expression < Attribute
def to_sql(formatter = Sql::SelectClause.new(relation))
diff --git a/lib/arel/engines/sql/relations/utilities/compound.rb b/lib/arel/engines/sql/relations/utilities/compound.rb
index 502bf8b01e..61df196d6e 100644
--- a/lib/arel/engines/sql/relations/utilities/compound.rb
+++ b/lib/arel/engines/sql/relations/utilities/compound.rb
@@ -1,6 +1,6 @@
module Arel
class Compound < Relation
- delegate :table, :table_sql, :array, :to => :relation
+ delegate :table, :table_sql, :to => :relation
end
end
\ No newline at end of file