diff options
| author | Bryan Helmkamp <bryan@brynary.com> | 2009-05-17 14:31:04 -0400 |
|---|---|---|
| committer | Bryan Helmkamp <bryan@brynary.com> | 2009-05-17 14:31:04 -0400 |
| commit | 7032a50297fce4d7724d1735e81e5df5fd919e71 (patch) | |
| tree | c52333abcc7a1454ea6ada7fe5e31e054f4e9540 /spec | |
| parent | bdca9ed42ffea10aa6989ea3ecebedb424fa01ed (diff) | |
| download | rails-7032a50297fce4d7724d1735e81e5df5fd919e71.tar.gz rails-7032a50297fce4d7724d1735e81e5df5fd919e71.tar.bz2 rails-7032a50297fce4d7724d1735e81e5df5fd919e71.zip | |
reorganized file structures
Conflicts:
lib/arel.rb
lib/arel/arel.rb
lib/arel/engines/memory/predicates.rb
lib/arel/engines/memory/relations/array.rb
lib/arel/engines/sql/relations/table.rb
Diffstat (limited to 'spec')
4 files changed, 12 insertions, 5 deletions
diff --git a/spec/arel/integration/joins/with_adjacency_spec.rb b/spec/arel/integration/joins/with_adjacency_spec.rb index fbac723e10..ffd6498749 100644 --- a/spec/arel/integration/joins/with_adjacency_spec.rb +++ b/spec/arel/integration/joins/with_adjacency_spec.rb @@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') module Arel describe Join do before do - @relation1 = Arel(:users) + @relation1 = Table(:users) @relation2 = @relation1.alias @predicate = @relation1[:id].eq(@relation2[:id]) end diff --git a/spec/arel/integration/joins/with_aggregations_spec.rb b/spec/arel/integration/joins/with_aggregations_spec.rb index 41978c0a5a..4aba005d51 100644 --- a/spec/arel/integration/joins/with_aggregations_spec.rb +++ b/spec/arel/integration/joins/with_aggregations_spec.rb @@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') module Arel describe Join do before do - @relation1 = Arel(:users) - @relation2 = Arel(:photos) + @relation1 = Table(:users) + @relation2 = Table(:photos) @predicate = @relation1[:id].eq(@relation2[:user_id]) end diff --git a/spec/arel/integration/joins/with_compounds_spec.rb b/spec/arel/integration/joins/with_compounds_spec.rb index 7582c5fc83..41f04349b8 100644 --- a/spec/arel/integration/joins/with_compounds_spec.rb +++ b/spec/arel/integration/joins/with_compounds_spec.rb @@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper') module Arel describe Join do before do - @relation1 = Arel(:users) - @relation2 = Arel(:photos) + @relation1 = Table(:users) + @relation2 = Table(:photos) @predicate = @relation1[:id].eq(@relation2[:user_id]) end diff --git a/spec/arel/unit/relations/array_spec.rb b/spec/arel/unit/relations/array_spec.rb index 1330f0f205..c90843cd7d 100644 --- a/spec/arel/unit/relations/array_spec.rb +++ b/spec/arel/unit/relations/array_spec.rb @@ -22,6 +22,13 @@ module Arel { @relation[:id] => 3 } ] end + + it '' do + @relation.where(@relation[:id].lt(3)).call.should == [ + { @relation[:id] => 1 }, + { @relation[:id] => 2 } + ] + end end end end
\ No newline at end of file |