Merge commit 'brynary/master'

Conflicts:

	lib/arel.rb
	lib/arel/session.rb

9 files changed, 284 insertions, 0 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
new file mode 100644
index 0000000000..bffecc9182
--- /dev/null
+++ b/spec/arel/engines/memory/integration/joins/cross_engine_spec.rb
@@ -0,0 +1,48 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+
+module Arel
+  describe Join do
+    before do
+      @users = Array.new([
+        [1, 'bryan' ],
+        [2, 'emilio' ],
+        [3, 'nick']
+      ], [:id, :name])
+      @photos = Table.new(:photos)
+      @photos.delete
+      @photos                                                                              \
+        .insert(@photos[:id] => 1, @photos[:user_id] => 1, @photos[:camera_id] => 6) \
+        .insert(@photos[:id] => 2, @photos[:user_id] => 2, @photos[:camera_id] => 42)
+    end
+
+    describe 'when the in memory relation is on the left' do
+      it 'joins across engines' do
+        @users                                         \
+          .join(@photos)                               \
+            .on(@users[:id].eq(@photos[:user_id]))     \
+          .project(@users[:name], @photos[:camera_id]) \
+        .let do |relation|
+          relation.call.should == [
+            Row.new(relation, ['bryan', '6']),
+            Row.new(relation, ['emilio', '42'])
+          ]
+        end
+      end
+    end
+
+    describe 'when the in memory relation is on the right' do
+      it 'joins across engines' do
+        @photos                                        \
+          .join(@users)                                \
+            .on(@users[:id].eq(@photos[:user_id]))     \
+          .project(@users[:name], @photos[:camera_id]) \
+        .let do |relation|
+          relation.call.should == [
+            Row.new(relation, ['bryan', '6']),
+            Row.new(relation, ['emilio', '42'])
+          ]
+        end
+      end
+    end
+  end
+end
diff --git a/spec/arel/engines/memory/unit/relations/array_spec.rb b/spec/arel/engines/memory/unit/relations/array_spec.rb
new file mode 100644
index 0000000000..dd9da41569
--- /dev/null
+++ b/spec/arel/engines/memory/unit/relations/array_spec.rb
@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+
+module Arel
+  describe Array do
+    before do
+      @relation = Array.new([
+        [1, 'duck' ],
+        [2, 'duck' ],
+        [3, 'goose']
+      ], [:id, :name])
+    end
+
+    describe '#attributes' do
+      it 'manufactures attributes corresponding to the names given on construction' do
+        @relation.attributes.should == [
+          Attribute.new(@relation, :id),
+          Attribute.new(@relation, :name)
+        ]
+      end
+    end
+
+    describe '#call' do
+      it "manufactures an array of hashes of attributes to values" do
+        @relation.call.should == [
+          Row.new(@relation, [1, 'duck']),
+          Row.new(@relation, [2, 'duck']),
+          Row.new(@relation, [3, 'goose'])
+        ]
+      end
+    end
+  end
+end
diff --git a/spec/arel/engines/memory/unit/relations/insert_spec.rb b/spec/arel/engines/memory/unit/relations/insert_spec.rb
new file mode 100644
index 0000000000..59e43328a3
--- /dev/null
+++ b/spec/arel/engines/memory/unit/relations/insert_spec.rb
@@ -0,0 +1,28 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+
+module Arel
+  describe Insert do
+    before do
+      @relation = Array.new([
+        [1, 'duck' ],
+        [2, 'duck' ],
+        [3, 'goose']
+      ], [:id, :name])
+    end
+
+    describe '#call' do
+      it "manufactures an array of hashes of attributes to values" do
+        @relation                                                         \
+          .insert(@relation[:id] => 4, @relation[:name] => 'guinea fowl') \
+        .let do |relation|
+          relation.call.should == [
+            Row.new(relation, [1, 'duck']),
+            Row.new(relation, [2, 'duck']),
+            Row.new(relation, [3, 'goose']),
+            Row.new(relation, [4, 'guinea fowl'])
+          ]
+        end
+      end
+    end
+  end
+end
diff --git a/spec/arel/engines/memory/unit/relations/join_spec.rb b/spec/arel/engines/memory/unit/relations/join_spec.rb
new file mode 100644
index 0000000000..110fdb03b7
--- /dev/null
+++ b/spec/arel/engines/memory/unit/relations/join_spec.rb
@@ -0,0 +1,31 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+
+module Arel
+  describe Join do
+    before do
+      @relation1 = Array.new([
+        [1, 'duck' ],
+        [2, 'duck' ],
+        [3, 'goose']
+      ], [:id, :name])
+      @relation2 = @relation1.alias
+    end
+
+    describe InnerJoin do
+      describe '#call' do
+        it 'combines the two tables where the predicate obtains' do
+          @relation1                                    \
+            .join(@relation2)                           \
+              .on(@relation1[:id].eq(@relation2[:id]))  \
+          .let do |relation|
+            relation.call.should == [
+              Row.new(relation, [1, 'duck',  1, 'duck' ]),
+              Row.new(relation, [2, 'duck',  2, 'duck' ]),
+              Row.new(relation, [3, 'goose', 3, 'goose'])
+            ]
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/arel/engines/memory/unit/relations/order_spec.rb b/spec/arel/engines/memory/unit/relations/order_spec.rb
new file mode 100644
index 0000000000..1e9690bbbf
--- /dev/null
+++ b/spec/arel/engines/memory/unit/relations/order_spec.rb
@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+
+module Arel
+  describe Order do
+    before do
+      @relation = Array.new([
+        [1, 'duck' ],
+        [2, 'duck' ],
+        [3, 'goose']
+      ], [:id, :name])
+    end
+
+    describe '#call' do
+      it 'sorts the relation with the provided ordering' do
+        @relation                     \
+          .order(@relation[:id].desc) \
+        .let do |relation|
+          relation.call.should == [
+            Row.new(relation, [3, 'goose']),
+            Row.new(relation, [2, 'duck' ]),
+            Row.new(relation, [1, 'duck' ])
+          ]
+        end
+      end
+    end
+  end
+end
diff --git a/spec/arel/engines/memory/unit/relations/project_spec.rb b/spec/arel/engines/memory/unit/relations/project_spec.rb
new file mode 100644
index 0000000000..1690910026
--- /dev/null
+++ b/spec/arel/engines/memory/unit/relations/project_spec.rb
@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+
+module Arel
+  describe Project do
+    before do
+      @relation = Array.new([
+        [1, 'duck' ],
+        [2, 'duck' ],
+        [3, 'goose']
+      ], [:id, :name])
+    end
+
+    describe '#call' do
+      it 'retains only the attributes that are provided' do
+        @relation                   \
+          .project(@relation[:id])  \
+        .let do |relation|
+          relation.call.should == [
+            Row.new(relation, [1]),
+            Row.new(relation, [2]),
+            Row.new(relation, [3])
+          ]
+        end
+      end
+    end
+  end
+end
diff --git a/spec/arel/engines/memory/unit/relations/skip_spec.rb b/spec/arel/engines/memory/unit/relations/skip_spec.rb
new file mode 100644
index 0000000000..3411c5493b
--- /dev/null
+++ b/spec/arel/engines/memory/unit/relations/skip_spec.rb
@@ -0,0 +1,26 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+
+module Arel
+  describe Skip do
+    before do
+      @relation = Array.new([
+        [1, 'duck' ],
+        [2, 'duck' ],
+        [3, 'goose']
+      ], [:id, :name])
+    end
+
+    describe '#call' do
+      it 'removes the first n rows' do
+        @relation   \
+          .skip(1)  \
+        .let do |relation|
+          relation.call.should == [
+            Row.new(relation, [2, 'duck']),
+            Row.new(relation, [3, 'goose']),
+          ]
+        end
+      end
+    end
+  end
+end
diff --git a/spec/arel/engines/memory/unit/relations/take_spec.rb b/spec/arel/engines/memory/unit/relations/take_spec.rb
new file mode 100644
index 0000000000..5e7c4fb462
--- /dev/null
+++ b/spec/arel/engines/memory/unit/relations/take_spec.rb
@@ -0,0 +1,26 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+
+module Arel
+  describe Take do
+    before do
+      @relation = Array.new([
+        [1, 'duck' ],
+        [2, 'duck' ],
+        [3, 'goose']
+      ], [:id, :name])
+    end
+
+    describe '#call' do
+      it 'removes the rows after the first n' do
+        @relation   \
+          .take(2)  \
+        .let do |relation|
+          relation.call.should == [
+            Row.new(relation, [1, 'duck']),
+            Row.new(relation, [2, 'duck']),
+          ]
+        end
+      end
+    end
+  end
+end
diff --git a/spec/arel/engines/memory/unit/relations/where_spec.rb b/spec/arel/engines/memory/unit/relations/where_spec.rb
new file mode 100644
index 0000000000..1d2c2eb39c
--- /dev/null
+++ b/spec/arel/engines/memory/unit/relations/where_spec.rb
@@ -0,0 +1,39 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+
+module Arel
+  describe Where do
+    before do
+      @relation = Array.new([
+        [1, 'duck' ],
+        [2, 'duck' ],
+        [3, 'goose']
+      ], [:id, :name])
+    end
+
+    describe '#call' do
+      it 'filters the relation with the provided predicate' do
+        @relation                       \
+          .where(@relation[:id].lt(3))  \
+        .let do |relation|
+          relation.call.should == [
+            Row.new(relation, [1, 'duck']),
+            Row.new(relation, [2, 'duck']),
+          ]
+        end
+      end
+
+      describe 'when filtering a where relation' do
+        it 'further filters the already-filtered relation with the provided predicate' do
+          @relation                       \
+            .where(@relation[:id].gt(1))  \
+            .where(@relation[:id].lt(3))  \
+          .let do |relation|
+            relation.call.should == [
+              Row.new(relation, [2, 'duck'])
+            ]
+          end
+        end
+      end
+    end
+  end
+end