arel 0.4.0 → 1.0.0.rc1

data/spec/engines/memory/integration/joins/cross_engine_spec.rb

@@ -24,11 +24,16 @@ module Arel
           .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', @adapter_returns_integer ? 6 : '6']),
-            Row.new(relation, ['emilio', @adapter_returns_integer ? 42 : '42'])
-          ]
+        .tap do |relation|
+          rows = relation.call
+          rows.length.should == 2
+          [
+            ['bryan', @adapter_returns_integer ? 6 : '6'],
+            ['emilio', @adapter_returns_integer ? 42 : '42']
+          ].zip(rows).each do |tuple, row|
+            row.relation.should == relation
+            row.tuple.should == tuple
+          end
         end
       end
     end
@@ -39,11 +44,16 @@ module Arel
           .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', @adapter_returns_integer ? 6 : '6']),
-            Row.new(relation, ['emilio', @adapter_returns_integer ? 42 : '42'])
-          ]
+        .tap do |relation|
+          rows = relation.call
+          rows.length.should == 2
+          [
+            ['bryan', @adapter_returns_integer ? 6 : '6'],
+            ['emilio', @adapter_returns_integer ? 42 : '42']
+          ].zip(rows).each do |tuple, row|
+            row.relation.should == relation
+            row.tuple.should == tuple
+          end
         end
       end
     end

data/spec/engines/memory/unit/relations/array_spec.rb

@@ -21,11 +21,12 @@ module Arel
 
     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'])
-        ]
+        rows = @relation.call
+        rows.length.should == 3
+        @relation.array.zip(rows).each do |tuple, row|
+          row.relation.should == @relation
+          row.tuple.should == tuple
+        end
       end
     end
   end

data/spec/engines/memory/unit/relations/join_spec.rb

@@ -17,12 +17,13 @@ module Arel
           @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'])
-            ]
+          .tap do |relation|
+            rows = relation.call
+            rows.length.should == 3
+            @relation1.array.zip(rows).each do |tuple, row|
+              row.relation.should == relation
+              row.tuple.should == (tuple * 2)
+            end
           end
         end
       end

data/spec/engines/memory/unit/relations/order_spec.rb

@@ -14,12 +14,13 @@ module Arel
       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' ])
-          ]
+        .tap do |relation|
+          rows = relation.call
+          rows.length.should == 3
+          @relation.array.reverse.zip(rows) do |tuple, row|
+            row.relation.should == relation
+            row.tuple.should == tuple
+          end
         end
       end
     end

data/spec/engines/memory/unit/relations/project_spec.rb

@@ -14,12 +14,12 @@ module Arel
       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])
-          ]
+        .tap do |relation|
+          rows = relation.call
+          @relation.array.zip(rows) do |tuple, row|
+            row.relation.should == relation
+            row.tuple.should == [tuple.first]
+          end
         end
       end
     end

data/spec/engines/memory/unit/relations/skip_spec.rb

@@ -14,11 +14,16 @@ module Arel
       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']),
-          ]
+        .tap do |relation|
+          rows = relation.call
+          rows.length.should == 2
+          one, two = *rows
+
+          one.relation.should == relation
+          one.tuple.should == [2, 'duck']
+
+          two.relation.should == relation
+          two.tuple.should == [3, 'goose']
         end
       end
     end

data/spec/engines/memory/unit/relations/take_spec.rb

@@ -14,11 +14,13 @@ module Arel
       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']),
-          ]
+        .tap do |relation|
+          rows = relation.call
+          rows.length.should == 2
+          rows.each_with_index do |row, i|
+            row.relation.should == relation
+            row.tuple.should == [i + 1, 'duck']
+          end
         end
       end
     end

data/spec/engines/memory/unit/relations/where_spec.rb

@@ -14,11 +14,13 @@ module Arel
       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']),
-          ]
+        .tap do |relation|
+          rows = relation.call
+          rows.length.should == 2
+          rows.each_with_index do |row, i|
+            row.relation.should == relation
+            row.tuple.should == [i + 1, 'duck']
+          end
         end
       end
 
@@ -27,10 +29,12 @@ module Arel
           @relation                       \
             .where(@relation[:id].gt(1))  \
             .where(@relation[:id].lt(3))  \
-          .let do |relation|
-            relation.call.should == [
-              Row.new(relation, [2, 'duck'])
-            ]
+          .tap do |relation|
+            rows = relation.call
+            rows.length.should == 1
+            row = rows.first
+            row.relation.should == relation
+            row.tuple.should == [2, 'duck']
           end
         end
       end

data/spec/engines/sql/unit/engine_spec.rb

@@ -1,12 +1,32 @@
 require 'spec_helper'
 
 module Arel
+  FakeAR = Struct.new(:connection)
+  class FakeConnection < Struct.new :called
+    def initialize c = []; super; end
+
+    def method_missing name, *args, &block
+      called << [name, args, block]
+    end
+  end
+
   describe Sql::Engine do
     before do
       @users = Table.new(:users)
       @users.delete
     end
 
+    describe "method missing" do
+      it "should ask for a connection" do
+        conn   = FakeConnection.new
+        ar     = FakeAR.new conn
+        engine = Arel::Sql::Engine.new ar
+
+        ar.connection = nil
+        lambda { engine.foo }.should raise_error
+      end
+    end
+
     describe "CRUD" do
       describe "#create" do
         it "inserts into the relation" do

data/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{

data/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{

data/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{

data/spec/engines/sql/unit/relations/table_spec.rb

@@ -108,13 +108,6 @@ module Arel
       end
     end
 
-    describe 'hashing' do
-      it "implements hash equality" do
-        Table.new(:users).should     hash_the_same_as(Table.new(:users))
-        Table.new(:users).should_not hash_the_same_as(Table.new(:photos))
-      end
-    end
-
     describe '#engine' do
       it "defaults to global engine" do
         Table.engine = engine = Sql::Engine.new

data/spec/engines/sql/unit/relations/take_spec.rb

@@ -34,6 +34,14 @@ module Arel
             ORDER BY "USERS"."ID" ASC)
             where rownum <= 4
           })
+
+          sql_with_distinct = Take.new(@relation.project('DISTINCT "USERS"."ID"'), @taken).to_sql
+          sql_with_distinct.should be_like(%Q{
+            select * from
+            (SELECT DISTINCT "USERS"."ID"
+            FROM "USERS")
+            where rownum <= 4
+          })
         end
 
         adapter_is_not :mysql, :oracle do
@@ -44,6 +52,24 @@ module Arel
           })
         end
       end
+
+      it "manufactures count sql with limit" do
+        sql = Take.new(@relation.project(@relation[:id].count), @taken).to_sql
+
+        adapter_is :mysql do
+          sql.should be_like(%Q{
+            SELECT COUNT(*) AS count_id
+            FROM (SELECT 1 FROM `users` LIMIT 4) AS subquery
+          })
+        end
+
+        adapter_is_not :mysql, :oracle do
+          sql.should be_like(%Q{
+            SELECT COUNT(*) AS count_id
+            FROM (SELECT 1 FROM "users" LIMIT 4) AS subquery
+          })
+        end
+      end
     end
   end
 end

data/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{

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift "#{dir}/../lib"
-
 require 'rubygems'
 require 'spec'
 require 'pp'
@@ -11,7 +8,7 @@ if adapter = ENV['ADAPTER']
   require "support/connections/#{adapter}_connection.rb"
 end
 
-Dir["#{dir}/{support,shared}/*.rb"].each do |file|
+Dir["spec/{support,shared}/*.rb"].each do |file|
   require file
 end
 

data/spec/sql/christener_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+module Arel
+  module Sql
+    describe "Christener" do
+      it "returns the first name" do
+        christener = Christener.new
+        table = Table.new 'users'
+        table2 = Table.new 'pictures'
+        christener.name_for(table).should == 'users'
+        christener.name_for(table2).should == 'pictures'
+        christener.name_for(table).should == 'users'
+      end
+
+      it "returns a unique name for an alias" do
+        christener = Christener.new
+        table = Table.new 'users'
+        table2 = Table.new 'users', :as => 'friends'
+        christener.name_for(table).should == 'users'
+        christener.name_for(table2).should == 'friends'
+      end
+
+      it "returns a unique name for an alias with same name" do
+        christener = Christener.new
+        table = Table.new 'users'
+        table2 = Table.new 'friends', :as => 'users'
+        christener.name_for(table).should == 'users'
+        christener.name_for(table2).should == 'users_2'
+      end
+
+      it "returns alias name" do
+        christener = Christener.new
+        table = Table.new 'users'
+        aliaz = Alias.new table
+
+        christener.name_for(table).should == 'users'
+        christener.name_for(aliaz).should == 'users_2'
+      end
+
+      it "returns alias first" do
+        christener = Christener.new
+        table = Table.new 'users'
+        aliaz = Alias.new table
+
+        christener.name_for(aliaz).should == 'users'
+        christener.name_for(table).should == 'users_2'
+      end
+
+      it "returns externalization name" do
+        christener = Christener.new
+        table = Table.new 'users'
+        ext = Externalization.new table
+
+        christener.name_for(table).should == 'users'
+        christener.name_for(ext).should == 'users_external'
+      end
+
+      it "returns aliases externalizations and tables" do
+        christener = Christener.new
+        table = Table.new 'users'
+        aliaz = Alias.new table
+        ext = Externalization.new table
+
+        christener.name_for(table).should == 'users'
+        christener.name_for(aliaz).should == 'users_2'
+        christener.name_for(ext).should == 'users_external'
+      end
+    end
+  end
+end