aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kallen <nkallen@nick-kallens-computer-2.local>2008-01-03 23:42:51 -0800
committerNick Kallen <nkallen@nick-kallens-computer-2.local>2008-01-03 23:42:51 -0800
commit4366f8658e75ead57070427c09b0c57abe683df9 (patch)
tree36d9314d1ccf75bf8dcaf3465e601f5139ba94b8
parent3117a5a6605fcb7c033b3ea5e074e5f087615fcf (diff)
downloadrails-4366f8658e75ead57070427c09b0c57abe683df9.tar.gz
rails-4366f8658e75ead57070427c09b0c57abe683df9.tar.bz2
rails-4366f8658e75ead57070427c09b0c57abe683df9.zip
removed overly flexible sql builder funcitonality
-rw-r--r--lib/sql_algebra/sql_builder/select_builder.rb1
-rw-r--r--spec/sql_builder/select_builder_spec.rb57
2 files changed, 0 insertions, 58 deletions
diff --git a/lib/sql_algebra/sql_builder/select_builder.rb b/lib/sql_algebra/sql_builder/select_builder.rb
index d4eb4feb56..68df68db93 100644
--- a/lib/sql_algebra/sql_builder/select_builder.rb
+++ b/lib/sql_algebra/sql_builder/select_builder.rb
@@ -7,7 +7,6 @@ class SelectBuilder < SqlBuilder
@table = table
@joins = JoinsBuilder.new(&block)
end
- delegate :inner_join, :left_outer_join, :to => :@joins
def where(&block)
@conditions ||= ConditionsBuilder.new
diff --git a/spec/sql_builder/select_builder_spec.rb b/spec/sql_builder/select_builder_spec.rb
index 39597b0392..7b059bd6bd 100644
--- a/spec/sql_builder/select_builder_spec.rb
+++ b/spec/sql_builder/select_builder_spec.rb
@@ -109,62 +109,5 @@ describe SelectBuilder do
""")
end
end
-
- describe 'repeated clauses' do
- describe 'with repeating joins' do
- it 'manufactures correct sql' do
- SelectBuilder.new do
- select do
- all
- end
- from :users do
- inner_join(:friendships) do
- equals do
- value :id
- value :user_id
- end
- end
- end
- inner_join(:pictures) do
- equals do
- value :id
- value :user_id
- end
- end
- end.to_s.should be_like("""
- SELECT *
- FROM users INNER JOIN friendships ON id = user_id INNER JOIN pictures ON id = user_id
- """)
- end
- end
-
- describe 'with repeating wheres' do
- it 'manufactures correct sql' do
- SelectBuilder.new do
- select do
- all
- end
- from :users
- where do
- equals do
- value :a
- value :b
- end
- end
- where do
- equals do
- value :b
- value :c
- end
- end
- end.to_s.should be_like("""
- SELECT *
- FROM users
- WHERE a = b
- AND b = c
- """)
- end
- end
- end
end
end \ No newline at end of file