diff options
Diffstat (limited to 'spec')
-rw-r--r-- | spec/algebra/unit/relations/project_spec.rb | 6 | ||||
-rw-r--r-- | spec/algebra/unit/relations/relation_spec.rb | 8 | ||||
-rw-r--r-- | spec/engines/sql/unit/relations/group_spec.rb | 4 | ||||
-rw-r--r-- | spec/engines/sql/unit/relations/order_spec.rb | 10 | ||||
-rw-r--r-- | spec/engines/sql/unit/relations/project_spec.rb | 8 | ||||
-rw-r--r-- | spec/engines/sql/unit/relations/where_spec.rb | 2 |
6 files changed, 19 insertions, 19 deletions
diff --git a/spec/algebra/unit/relations/project_spec.rb b/spec/algebra/unit/relations/project_spec.rb index 8886e65a2e..294bffafe9 100644 --- a/spec/algebra/unit/relations/project_spec.rb +++ b/spec/algebra/unit/relations/project_spec.rb @@ -9,7 +9,7 @@ module Arel describe '#attributes' do before do - @projection = Project.new(@relation, @attribute) + @projection = Project.new(@relation, [@attribute]) end it "manufactures attributes associated with the projection relation" do @@ -20,13 +20,13 @@ module Arel describe '#externalizable?' do describe 'when the projections are attributes' do it 'returns false' do - Project.new(@relation, @attribute).should_not be_externalizable + Project.new(@relation, [@attribute]).should_not be_externalizable end end describe 'when the projections include an aggregation' do it "obtains" do - Project.new(@relation, @attribute.sum).should be_externalizable + Project.new(@relation, [@attribute.sum]).should be_externalizable end end end diff --git a/spec/algebra/unit/relations/relation_spec.rb b/spec/algebra/unit/relations/relation_spec.rb index 2a2fb15d89..f4769526da 100644 --- a/spec/algebra/unit/relations/relation_spec.rb +++ b/spec/algebra/unit/relations/relation_spec.rb @@ -97,11 +97,11 @@ module Arel end it "manufactures a where relation" do - @relation.where(@predicate).should == Where.new(@relation, @predicate) + @relation.where(@predicate).should == Where.new(@relation, [@predicate]) end it "accepts arbitrary strings" do - @relation.where("arbitrary").should == Where.new(@relation, "arbitrary") + @relation.where("arbitrary").should == Where.new(@relation, ["arbitrary"]) end describe 'when given a blank predicate' do @@ -113,7 +113,7 @@ module Arel describe '#order' do it "manufactures an order relation" do - @relation.order(@attribute1, @attribute2).should == Order.new(@relation, @attribute1, @attribute2) + @relation.order(@attribute1, @attribute2).should == Order.new(@relation, [@attribute1, @attribute2]) end describe 'when given a blank ordering' do @@ -149,7 +149,7 @@ module Arel describe '#group' do it 'manufactures a group relation' do - @relation.group(@attribute1, @attribute2).should == Group.new(@relation, @attribute1, @attribute2) + @relation.group(@attribute1, @attribute2).should == Group.new(@relation, [@attribute1, @attribute2]) end describe 'when given blank groupings' do diff --git a/spec/engines/sql/unit/relations/group_spec.rb b/spec/engines/sql/unit/relations/group_spec.rb index 72a9f4e99e..c32091bf08 100644 --- a/spec/engines/sql/unit/relations/group_spec.rb +++ b/spec/engines/sql/unit/relations/group_spec.rb @@ -10,7 +10,7 @@ module Arel describe '#to_sql' do describe 'when given a predicate' do it "manufactures sql with where clause conditions" do - sql = Group.new(@relation, @attribute).to_sql + sql = Group.new(@relation, [@attribute]).to_sql adapter_is :mysql do sql.should be_like(%Q{ @@ -40,7 +40,7 @@ module Arel describe 'when given a string' do it "passes the string through to the where clause" do - sql = Group.new(@relation, 'asdf').to_sql + sql = Group.new(@relation, ['asdf']).to_sql adapter_is :mysql do sql.should be_like(%Q{ diff --git a/spec/engines/sql/unit/relations/order_spec.rb b/spec/engines/sql/unit/relations/order_spec.rb index 3c9d9ef598..59637876bf 100644 --- a/spec/engines/sql/unit/relations/order_spec.rb +++ b/spec/engines/sql/unit/relations/order_spec.rb @@ -10,7 +10,7 @@ module Arel describe '#to_sql' do describe "when given an attribute" do it "manufactures sql with an order clause populated by the attribute" do - sql = Order.new(@relation, @attribute).to_sql + sql = Order.new(@relation, [@attribute]).to_sql adapter_is :mysql do sql.should be_like(%Q{ @@ -60,7 +60,7 @@ module Arel end it "manufactures sql with an order clause populated by comma-separated attributes" do - sql = Order.new(@relation, @attribute, @another_attribute).to_sql + sql = Order.new(@relation, [@attribute, @another_attribute]).to_sql adapter_is :mysql do sql.should be_like(%Q{ @@ -94,7 +94,7 @@ module Arel end it "passes the string through to the order clause" do - sql = Order.new(@relation, @string).to_sql + sql = Order.new(@relation, [@string]).to_sql adapter_is :mysql do sql.should be_like(%Q{ @@ -124,12 +124,12 @@ module Arel describe "when ordering an ordered relation" do before do - @ordered_relation = Order.new(@relation, @attribute) + @ordered_relation = Order.new(@relation, [@attribute]) @another_attribute = @relation[:name] end it "manufactures sql with the order clause of the last ordering preceding the first ordering" do - sql = Order.new(@ordered_relation, @another_attribute).to_sql + sql = Order.new(@ordered_relation, [@another_attribute]).to_sql adapter_is :mysql do sql.should be_like(%Q{ diff --git a/spec/engines/sql/unit/relations/project_spec.rb b/spec/engines/sql/unit/relations/project_spec.rb index e73c7775a1..b5d2d33d4b 100644 --- a/spec/engines/sql/unit/relations/project_spec.rb +++ b/spec/engines/sql/unit/relations/project_spec.rb @@ -10,7 +10,7 @@ module Arel describe '#to_sql' do describe 'when given an attribute' do it "manufactures sql with a limited select clause" do - sql = Project.new(@relation, @attribute).to_sql + sql = Project.new(@relation, [@attribute]).to_sql adapter_is :mysql do sql.should be_like(%Q{ @@ -37,11 +37,11 @@ module Arel describe 'when given a relation' do before do - @scalar_relation = Project.new(@relation, @relation[:name]) + @scalar_relation = Project.new(@relation, [@relation[:name]]) end it "manufactures sql with scalar selects" do - sql = Project.new(@relation, @scalar_relation).to_sql + sql = Project.new(@relation, [@scalar_relation]).to_sql adapter_is :mysql do sql.should be_like(%Q{ @@ -65,7 +65,7 @@ module Arel describe 'when given a string' do it "passes the string through to the select clause" do - sql = Project.new(@relation, 'asdf').to_sql + sql = Project.new(@relation, ['asdf']).to_sql adapter_is :mysql do sql.should be_like(%Q{ diff --git a/spec/engines/sql/unit/relations/where_spec.rb b/spec/engines/sql/unit/relations/where_spec.rb index 5f559efad3..69793d63a1 100644 --- a/spec/engines/sql/unit/relations/where_spec.rb +++ b/spec/engines/sql/unit/relations/where_spec.rb @@ -10,7 +10,7 @@ module Arel describe '#to_sql' do describe 'when given a predicate' do it "manufactures sql with where clause conditions" do - sql = Where.new(@relation, @predicate).to_sql + sql = Where.new(@relation, [@predicate]).to_sql adapter_is :mysql do sql.should be_like(%Q{ |