Merge commit 'brynary/master'

Conflicts:

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

1 files changed, 0 insertions, 36 deletions

diff --git a/spec/arel/unit/relations/alias_spec.rb b/spec/arel/unit/relations/alias_spec.rb
deleted file mode 100644
index 460a0ed0df..0000000000
--- a/spec/arel/unit/relations/alias_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
-
-module Arel
-  describe Alias do
-    before do
-      @relation = Table.new(:users)
-    end
-
-    describe '==' do
-      it "obtains if the objects are the same" do
-        Alias.new(@relation).should_not == Alias.new(@relation)
-        (aliaz = Alias.new(@relation)).should == aliaz
-      end
-    end
-
-    describe '#to_sql' do
-      describe 'when there is no ambiguity' do
-        it 'does not alias table names anywhere a table name can appear' do
-          @relation                       \
-            .where(@relation[:id].eq(1))  \
-            .order(@relation[:id])        \
-            .project(@relation[:id])      \
-            .group(@relation[:id])        \
-            .alias                        \
-          .to_sql.should be_like("
-            SELECT `users`.`id`
-            FROM `users`
-            WHERE `users`.`id` = 1
-            GROUP BY `users`.`id`
-            ORDER BY `users`.`id`
-          ")
-        end
-      end
-    end
-  end
-end