aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-04-08 16:27:45 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-04-08 16:27:45 -0700
commit462a0197b2f1941568d5ba2f86018a788d9fb150 (patch)
tree4d7cf12f8bd63de47ebac40d05502fd033d3bcec /lib/arel
parentb7a54435c73a5c4422ef2e53412516088d5e8fb4 (diff)
parent8fc2241df61ce274b652fae09e4640a50a500af7 (diff)
downloadrails-462a0197b2f1941568d5ba2f86018a788d9fb150.tar.gz
rails-462a0197b2f1941568d5ba2f86018a788d9fb150.tar.bz2
rails-462a0197b2f1941568d5ba2f86018a788d9fb150.zip
Merge branch 'master' into collector
* master: removing unused join_sql method
Diffstat (limited to 'lib/arel')
-rw-r--r--lib/arel/select_manager.rb7
-rw-r--r--lib/arel/visitors.rb1
-rw-r--r--lib/arel/visitors/join_sql.rb19
3 files changed, 0 insertions, 27 deletions
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index db34ffb946..fe0d26a16e 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -215,13 +215,6 @@ module Arel
end
alias limit= take
- def join_sql
- return nil if @ctx.source.right.empty?
-
- sql = visitor.dup.extend(Visitors::JoinSql).accept @ctx
- Nodes::SqlLiteral.new sql
- end
-
def join_sources
@ctx.source.right
end
diff --git a/lib/arel/visitors.rb b/lib/arel/visitors.rb
index 3986ad9ce5..4a8d254ba7 100644
--- a/lib/arel/visitors.rb
+++ b/lib/arel/visitors.rb
@@ -6,7 +6,6 @@ require 'arel/visitors/postgresql'
require 'arel/visitors/mysql'
require 'arel/visitors/mssql'
require 'arel/visitors/oracle'
-require 'arel/visitors/join_sql'
require 'arel/visitors/where_sql'
require 'arel/visitors/dot'
require 'arel/visitors/ibm_db'
diff --git a/lib/arel/visitors/join_sql.rb b/lib/arel/visitors/join_sql.rb
deleted file mode 100644
index 1cdd7eb5ca..0000000000
--- a/lib/arel/visitors/join_sql.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module Arel
- module Visitors
- ###
- # This class produces SQL for JOIN clauses but omits the "single-source"
- # part of the Join grammar:
- #
- # http://www.sqlite.org/syntaxdiagrams.html#join-source
- #
- # This visitor is used in SelectManager#join_sql and is for backwards
- # compatibility with Arel V1.0
- module JoinSql
- private
-
- def visit_Arel_Nodes_SelectCore o
- o.source.right.map { |j| visit j }.join ' '
- end
- end
- end
-end