aboutsummaryrefslogtreecommitdiffstats
path: root/spec/relations
diff options
context:
space:
mode:
authorNick Kallen <nkallen@nick-kallens-computer-2.local>2008-01-05 15:38:03 -0800
committerNick Kallen <nkallen@nick-kallens-computer-2.local>2008-01-05 15:38:03 -0800
commit648209d11f16243a9f073b177e6b32ce8c094408 (patch)
tree2a5bff6d25c7715e4395c0745865340d65e47a97 /spec/relations
parentd1e5265a1db424e7361878772d32ae4ec39babe2 (diff)
downloadrails-648209d11f16243a9f073b177e6b32ce8c094408.tar.gz
rails-648209d11f16243a9f073b177e6b32ce8c094408.tar.bz2
rails-648209d11f16243a9f073b177e6b32ce8c094408.zip
minor cleanup
Diffstat (limited to 'spec/relations')
-rw-r--r--spec/relations/join_relation_spec.rb2
-rw-r--r--spec/relations/order_relation_spec.rb2
-rw-r--r--spec/relations/projection_relation_spec.rb2
-rw-r--r--spec/relations/range_relation_spec.rb2
-rw-r--r--spec/relations/rename_relation_spec.rb2
-rw-r--r--spec/relations/selection_relation_spec.rb2
6 files changed, 6 insertions, 6 deletions
diff --git a/spec/relations/join_relation_spec.rb b/spec/relations/join_relation_spec.rb
index b7357b02e8..b70bf553b1 100644
--- a/spec/relations/join_relation_spec.rb
+++ b/spec/relations/join_relation_spec.rb
@@ -36,7 +36,7 @@ describe JoinRelation do
end
it 'manufactures sql joining the two tables on the predicate, merging the selects' do
- ConcreteJoinRelation.new(@relation1, @relation2, @predicate).to_sql.to_s.should == SelectBuilder.new do
+ ConcreteJoinRelation.new(@relation1, @relation2, @predicate).to_s.should == SelectBuilder.new do
select do
column :foo, :name
column :foo, :id
diff --git a/spec/relations/order_relation_spec.rb b/spec/relations/order_relation_spec.rb
index 8792683eec..a78ac148e2 100644
--- a/spec/relations/order_relation_spec.rb
+++ b/spec/relations/order_relation_spec.rb
@@ -25,7 +25,7 @@ describe OrderRelation do
describe '#to_sql' do
it "manufactures sql with an order clause" do
- OrderRelation.new(@relation1, @attribute1).to_sql.to_s.should == SelectBuilder.new do
+ OrderRelation.new(@relation1, @attribute1).to_s.should == SelectBuilder.new do
select do
column :foo, :name
column :foo, :id
diff --git a/spec/relations/projection_relation_spec.rb b/spec/relations/projection_relation_spec.rb
index 149669c5b2..5a33b16bd5 100644
--- a/spec/relations/projection_relation_spec.rb
+++ b/spec/relations/projection_relation_spec.rb
@@ -25,7 +25,7 @@ describe ProjectionRelation do
describe '#to_sql' do
it "manufactures sql with a limited select clause" do
- ProjectionRelation.new(@relation1, @attribute1).to_sql.to_s.should == SelectBuilder.new do
+ ProjectionRelation.new(@relation1, @attribute1).to_s.should == SelectBuilder.new do
select do
column :foo, :id
end
diff --git a/spec/relations/range_relation_spec.rb b/spec/relations/range_relation_spec.rb
index 947bf35120..926cc0929f 100644
--- a/spec/relations/range_relation_spec.rb
+++ b/spec/relations/range_relation_spec.rb
@@ -26,7 +26,7 @@ describe RangeRelation do
it "manufactures sql with limit and offset" do
range_size = @range2.last - @range2.first + 1
range_start = @range2.first
- RangeRelation.new(@relation1, @range2).to_sql.to_s.should == SelectBuilder.new do
+ RangeRelation.new(@relation1, @range2).to_s.should == SelectBuilder.new do
select do
column :foo, :name
column :foo, :id
diff --git a/spec/relations/rename_relation_spec.rb b/spec/relations/rename_relation_spec.rb
index 7db329ad7a..301ee6db9e 100644
--- a/spec/relations/rename_relation_spec.rb
+++ b/spec/relations/rename_relation_spec.rb
@@ -52,7 +52,7 @@ describe RenameRelation do
describe '#to_sql' do
it 'manufactures sql aliasing the attribute' do
- @renamed_relation.to_sql.to_s.should == SelectBuilder.new do
+ @renamed_relation.to_s.should == SelectBuilder.new do
select do
column :foo, :name
column :foo, :id, :schmid
diff --git a/spec/relations/selection_relation_spec.rb b/spec/relations/selection_relation_spec.rb
index 7ffb3b3676..656a386fd6 100644
--- a/spec/relations/selection_relation_spec.rb
+++ b/spec/relations/selection_relation_spec.rb
@@ -35,7 +35,7 @@ describe SelectionRelation do
describe '#to_sql' do
it "manufactures sql with where clause conditions" do
- SelectionRelation.new(@relation1, @predicate1).to_sql.to_s.should == SelectBuilder.new do
+ SelectionRelation.new(@relation1, @predicate1).to_s.should == SelectBuilder.new do
select do
column :foo, :name
column :foo, :id