diff options
| author | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-05-27 14:37:11 -0700 |
|---|---|---|
| committer | Bryan Helmkamp <bryan@brynary.com> | 2009-05-17 15:46:19 -0400 |
| commit | 20b28b441b651d0404d64049253898c061a039be (patch) | |
| tree | 4b9a8fc9e8f9207017248f129550c0283b0f520b /lib/arel/engines/sql | |
| parent | 2fe585328d6a24df310d3e60059c9c7b05b64bac (diff) | |
| download | rails-20b28b441b651d0404d64049253898c061a039be.tar.gz rails-20b28b441b651d0404d64049253898c061a039be.tar.bz2 rails-20b28b441b651d0404d64049253898c061a039be.zip | |
using in memory relations as results from sql relation
Conflicts:
lib/arel/algebra/primitives/expression.rb
lib/arel/algebra/relations/relation.rb
Diffstat (limited to 'lib/arel/engines/sql')
| -rw-r--r-- | lib/arel/engines/sql/engine.rb | 10 | ||||
| -rw-r--r-- | lib/arel/engines/sql/relations/operations/join.rb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/arel/engines/sql/engine.rb b/lib/arel/engines/sql/engine.rb index e5d1a8b0ca..0700ae9733 100644 --- a/lib/arel/engines/sql/engine.rb +++ b/lib/arel/engines/sql/engine.rb @@ -19,12 +19,12 @@ module Arel end def read(relation) - results = connection.execute(relation.to_sql) - rows = [] - results.each do |row| - rows << attributes.zip(row).to_hash + # FIXME + class << rows = connection.execute(relation.to_sql) + include Enumerable end - rows + + Array.new(rows, relation.attributes) end def update(relation) diff --git a/lib/arel/engines/sql/relations/operations/join.rb b/lib/arel/engines/sql/relations/operations/join.rb index 2f5e23644e..f848fd3268 100644 --- a/lib/arel/engines/sql/relations/operations/join.rb +++ b/lib/arel/engines/sql/relations/operations/join.rb @@ -22,7 +22,7 @@ module Arel end class OuterJoin < Join - def join_sql; "OUTER JOIN" end + def join_sql; "LEFT OUTER JOIN" end end class StringJoin < Join |