aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/engines/sql/relations/operations
diff options
context:
space:
mode:
authorBryan Helmkamp <bryan@brynary.com>2009-05-17 14:49:56 -0400
committerBryan Helmkamp <bryan@brynary.com>2009-05-17 14:49:56 -0400
commit3a6e8e5a3f99841691b70b89b0a10f836e6ec071 (patch)
tree89e59775b729616ca9cb4a4f1f70415af35ce3d7 /lib/arel/engines/sql/relations/operations
parent892337509b2bd269920dc567bc48c6a28c7222d2 (diff)
downloadrails-3a6e8e5a3f99841691b70b89b0a10f836e6ec071.tar.gz
rails-3a6e8e5a3f99841691b70b89b0a10f836e6ec071.tar.bz2
rails-3a6e8e5a3f99841691b70b89b0a10f836e6ec071.zip
join sql stuff moved into sql adapter
Conflicts: lib/arel/algebra/primitives/value.rb lib/arel/algebra/relations/operations/join.rb lib/arel/algebra/relations/relation.rb spec/arel/unit/relations/join_spec.rb
Diffstat (limited to 'lib/arel/engines/sql/relations/operations')
-rw-r--r--lib/arel/engines/sql/relations/operations/join.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/arel/engines/sql/relations/operations/join.rb b/lib/arel/engines/sql/relations/operations/join.rb
index be21119bc9..2f5e23644e 100644
--- a/lib/arel/engines/sql/relations/operations/join.rb
+++ b/lib/arel/engines/sql/relations/operations/join.rb
@@ -16,4 +16,18 @@ module Arel
end
end
end
+
+ class InnerJoin < Join
+ def join_sql; "INNER JOIN" end
+ end
+
+ class OuterJoin < Join
+ def join_sql; "OUTER JOIN" end
+ end
+
+ class StringJoin < Join
+ def joins(_, __ = nil)
+ relation2
+ end
+ end
end \ No newline at end of file