diff options
| author | Raimonds Simanovskis <raimonds.simanovskis@gmail.com> | 2010-02-10 19:50:59 +0200 |
|---|---|---|
| committer | Raimonds Simanovskis <raimonds.simanovskis@gmail.com> | 2010-03-01 12:02:10 +0200 |
| commit | 20a10e5302ce8f912d27c57702b542a019c7f9f9 (patch) | |
| tree | 38de3309520244ba6fda99b8d47525852e926491 /spec/arel/engines/memory | |
| parent | 98a87e181aed8131797e55db2ca957bc515cdaca (diff) | |
| download | rails-20a10e5302ce8f912d27c57702b542a019c7f9f9.tar.gz rails-20a10e5302ce8f912d27c57702b542a019c7f9f9.tar.bz2 rails-20a10e5302ce8f912d27c57702b542a019c7f9f9.zip | |
changes for Oracle support - OracleCompiler and corresponding tests with Oracle syntax
Diffstat (limited to 'spec/arel/engines/memory')
| -rw-r--r-- | spec/arel/engines/memory/integration/joins/cross_engine_spec.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/spec/arel/engines/memory/integration/joins/cross_engine_spec.rb b/spec/arel/engines/memory/integration/joins/cross_engine_spec.rb index db754d9cec..0dfcff1ee8 100644 --- a/spec/arel/engines/memory/integration/joins/cross_engine_spec.rb +++ b/spec/arel/engines/memory/integration/joins/cross_engine_spec.rb @@ -12,6 +12,11 @@ module Arel @photos.delete @photos.insert(@photos[:id] => 1, @photos[:user_id] => 1, @photos[:camera_id] => 6) @photos.insert(@photos[:id] => 2, @photos[:user_id] => 2, @photos[:camera_id] => 42) + # Oracle adapter returns database integers as Ruby integers and not strings + @adapter_returns_integer = false + adapter_is :oracle do + @adapter_returns_integer = true + end end describe 'when the in memory relation is on the left' do @@ -22,8 +27,8 @@ module Arel .project(@users[:name], @photos[:camera_id]) \ .let do |relation| relation.call.should == [ - Row.new(relation, ['bryan', '6']), - Row.new(relation, ['emilio', '42']) + Row.new(relation, ['bryan', @adapter_returns_integer ? 6 : '6']), + Row.new(relation, ['emilio', @adapter_returns_integer ? 42 : '42']) ] end end @@ -37,8 +42,8 @@ module Arel .project(@users[:name], @photos[:camera_id]) \ .let do |relation| relation.call.should == [ - Row.new(relation, ['bryan', '6']), - Row.new(relation, ['emilio', '42']) + Row.new(relation, ['bryan', @adapter_returns_integer ? 6 : '6']), + Row.new(relation, ['emilio', @adapter_returns_integer ? 42 : '42']) ] end end |