aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/engines
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-07-26 14:59:46 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-07-26 14:59:46 -0700
commitd41b9c54aaafb852ff2e4fbba56962cb3eeb1837 (patch)
treea8f3bdac6ad56be06727056cde7c94ef22065ef5 /lib/arel/engines
parent66cedcc76bf8ac97a65bf12f6b7dd2eea83ebfe3 (diff)
downloadrails-d41b9c54aaafb852ff2e4fbba56962cb3eeb1837.tar.gz
rails-d41b9c54aaafb852ff2e4fbba56962cb3eeb1837.tar.bz2
rails-d41b9c54aaafb852ff2e4fbba56962cb3eeb1837.zip
more class reorganization
Diffstat (limited to 'lib/arel/engines')
-rw-r--r--lib/arel/engines/sql/relations.rb1
-rw-r--r--lib/arel/engines/sql/relations/operations/join.rb33
2 files changed, 0 insertions, 34 deletions
diff --git a/lib/arel/engines/sql/relations.rb b/lib/arel/engines/sql/relations.rb
index c29739ef7f..c692683421 100644
--- a/lib/arel/engines/sql/relations.rb
+++ b/lib/arel/engines/sql/relations.rb
@@ -2,4 +2,3 @@ require 'arel/engines/sql/relations/utilities/compound'
require 'arel/engines/sql/relations/utilities/nil'
require 'arel/engines/sql/relations/compiler'
require 'arel/engines/sql/relations/table'
-require 'arel/engines/sql/relations/operations/join'
diff --git a/lib/arel/engines/sql/relations/operations/join.rb b/lib/arel/engines/sql/relations/operations/join.rb
deleted file mode 100644
index 9733657365..0000000000
--- a/lib/arel/engines/sql/relations/operations/join.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Arel
- class Join
- def table_sql(formatter = Sql::TableReference.new(self))
- relation1.externalize.table_sql(formatter)
- end
-
- def joins(environment, formatter = Sql::TableReference.new(environment))
- @joins ||= begin
- this_join = [
- join_sql,
- relation2.externalize.table_sql(formatter),
- ("ON" unless predicates.blank?),
- (ons + relation2.externalize.wheres).collect { |p| p.bind(environment.relation).to_sql(Sql::WhereClause.new(environment)) }.join(' AND ')
- ].compact.join(" ")
- [relation1.joins(environment), this_join, relation2.joins(environment)].compact.join(" ")
- end
- end
- end
-
- class InnerJoin < Join
- def join_sql; "INNER JOIN" end
- end
-
- class OuterJoin < Join
- def join_sql; "LEFT OUTER JOIN" end
- end
-
- class StringJoin < Join
- def joins(environment, formatter = Sql::TableReference.new(environment))
- [relation1.joins(environment), relation2].compact.join(" ")
- end
- end
-end