diff options
author | Bryan Helmkamp <bryan@brynary.com> | 2009-05-17 14:20:29 -0400 |
---|---|---|
committer | Bryan Helmkamp <bryan@brynary.com> | 2009-05-17 14:24:06 -0400 |
commit | bdca9ed42ffea10aa6989ea3ecebedb424fa01ed (patch) | |
tree | 80682aa1c8fe544f1e91ccb8c529e66c8a1ddc94 /spec/arel | |
parent | 2bbf8ca9d2af3ea959a21c3729b4894bc31f088b (diff) | |
download | rails-bdca9ed42ffea10aa6989ea3ecebedb424fa01ed.tar.gz rails-bdca9ed42ffea10aa6989ea3ecebedb424fa01ed.tar.bz2 rails-bdca9ed42ffea10aa6989ea3ecebedb424fa01ed.zip |
moved sql related code to its own engine area
Conflicts:
lib/arel/engine.rb
lib/arel/extensions/object.rb
lib/arel/predicates.rb
lib/arel/primitives/attribute.rb
lib/arel/primitives/expression.rb
lib/arel/primitives/value.rb
lib/arel/relations/operations/join.rb
lib/arel/relations/relation.rb
lib/arel/relations/utilities/externalization.rb
lib/arel/relations/utilities/nil.rb
lib/arel/relations/writes/delete.rb
lib/arel/relations/writes/insert.rb
lib/arel/relations/writes/update.rb
spec/arel/unit/relations/skip_spec.rb
spec/arel/unit/relations/take_spec.rb
spec/spec_helper.rb
Diffstat (limited to 'spec/arel')
-rw-r--r-- | spec/arel/unit/relations/skip_spec.rb | 2 | ||||
-rw-r--r-- | spec/arel/unit/relations/table_spec.rb | 4 | ||||
-rw-r--r-- | spec/arel/unit/relations/take_spec.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/arel/unit/relations/skip_spec.rb b/spec/arel/unit/relations/skip_spec.rb index 0653d795b1..2c8f6ccadb 100644 --- a/spec/arel/unit/relations/skip_spec.rb +++ b/spec/arel/unit/relations/skip_spec.rb @@ -9,7 +9,7 @@ module Arel describe '#to_sql' do it "manufactures sql with limit and offset" do - sql = Skip.new(@relation, @skipped).to_s + sql = Skip.new(@relation, @skipped).to_sql adapter_is :mysql do sql.should be_like(%Q{ diff --git a/spec/arel/unit/relations/table_spec.rb b/spec/arel/unit/relations/table_spec.rb index 08486c7b6c..211e6921f8 100644 --- a/spec/arel/unit/relations/table_spec.rb +++ b/spec/arel/unit/relations/table_spec.rb @@ -87,12 +87,12 @@ module Arel describe '#engine' do it "defaults to global engine" do - Table.engine = engine = Engine.new + Table.engine = engine = Sql::Engine.new Table.new(:users).engine.should == engine end it "can be specified" do - Table.new(:users, engine = Engine.new).engine.should == engine + Table.new(:users, engine = Sql::Engine.new).engine.should == engine end end end diff --git a/spec/arel/unit/relations/take_spec.rb b/spec/arel/unit/relations/take_spec.rb index 911b84e01e..d6442fc9d1 100644 --- a/spec/arel/unit/relations/take_spec.rb +++ b/spec/arel/unit/relations/take_spec.rb @@ -9,7 +9,7 @@ module Arel describe '#to_sql' do it "manufactures sql with limit and offset" do - sql = Take.new(@relation, @taken).to_s + sql = Take.new(@relation, @taken).to_sql adapter_is :mysql do sql.should be_like(%Q{ |