arel 0.2.pre → 0.2.0

data/History.txt

@@ -1,8 +1,8 @@
-== Git
-
-* 1 major enhancement
+== 0.2.0 / 2010-01-31
 
   * Ruby 1.9 compatibility
+  * Many improvements to support the Arel integration into ActiveRecord (see `git log v0.1.0..v0.2.0`)
+  * Thanks to Emilio Tagua and Pratik Naik for many significant contributions!
 
 == 0.1.0 / 2009-08-06
 

data/Thorfile

@@ -1,4 +1,4 @@
-require "activerecord"
+require "active_support"
 
 module GemHelpers
 

data/arel.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arel}
-  s.version = "0.2.pre"
+  s.version = "0.2.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp", "Nick Kallen"]
-  s.date = %q{2010-01-08}
+  s.date = %q{2010-01-31}
   s.description = %q{Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex
 of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be
 a framework framework; that is, you can build your own ORM with it, focusing on

data/lib/arel.rb

@@ -7,5 +7,5 @@ module Arel
   require 'arel/engines'
   autoload :Session, 'arel/session'
 
-  VERSION = "0.2.pre"
+  VERSION = "0.2.0"
 end

data/lib/arel/algebra/relations/operations/join.rb

@@ -47,6 +47,10 @@ module Arel
   class InnerJoin  < Join; end
   class OuterJoin  < Join; end
   class StringJoin < Join
+    def externalizable?
+      relation1.externalizable?
+    end
+
     def attributes
       relation1.externalize.attributes
     end

data/lib/arel/engines/sql/core_extensions/array.rb

@@ -2,7 +2,11 @@ module Arel
   module Sql
     module ArrayExtensions
       def to_sql(formatter = nil)
-        "(" + collect { |e| e.to_sql(formatter) }.join(', ') + ")"
+        if any?
+          "(" + collect { |e| e.to_sql(formatter) }.join(', ') + ")"
+        else
+          "(NULL)"
+        end
       end
 
       def inclusion_predicate_sql

data/lib/arel/engines/sql/engine.rb

@@ -9,6 +9,10 @@ module Arel
         @ar.connection
       end
 
+      def adapter_name
+        @adapter_name ||= connection.adapter_name
+      end
+
       def method_missing(method, *args, &block)
         @ar.connection.send(method, *args, &block)
       end

data/lib/arel/engines/sql/relations/table.rb

@@ -11,7 +11,7 @@ module Arel
       if options.is_a?(Hash)
         @options = options
         @engine = options[:engine] || Table.engine
-        @table_alias = options[:as].to_s if options[:as].present?
+        @table_alias = options[:as].to_s if options[:as].present? && options[:as].to_s != @name
       else
         @engine = options # Table.new('foo', engine)
       end
@@ -52,8 +52,9 @@ module Arel
     end
 
     def ==(other)
-      Table      === other and
-      name       ==  other.name
+      Table       === other and
+      name        ==  other.name and
+      table_alias ==  other.table_alias
     end
   end
 end

data/spec/arel/engines/sql/unit/predicates/in_spec.rb

@@ -45,6 +45,25 @@ module Arel
               end
             end
           end
+
+          describe 'when the array is empty' do
+            before do
+              @array = []
+            end
+
+            it 'manufactures sql with a comma separated list' do
+              sql = In.new(@attribute, @array).to_sql
+
+              adapter_is :mysql do
+                sql.should be_like(%Q{`users`.`id` IN (NULL)})
+              end
+
+              adapter_is_not :mysql do
+                sql.should be_like(%Q{"users"."id" IN (NULL)})
+              end
+            end
+          end
+
         end
 
         describe 'when relating to a range' do

data/spec/arel/engines/sql/unit/relations/join_spec.rb

@@ -103,7 +103,36 @@ module Arel
             })
           end
         end
-      end
+
+        it "passes the string when there are multiple string joins" do
+          relation = StringJoin.new(@relation1, "INNER JOIN asdf ON fdsa")
+          relation = StringJoin.new(relation, "INNER JOIN lifo ON fifo")
+          sql = StringJoin.new(relation, "INNER JOIN hatful ON hallow").to_sql
+
+          adapter_is :mysql do
+            sql.should be_like(%Q{
+              SELECT `users`.`id`, `users`.`name`
+              FROM `users`
+                INNER JOIN asdf ON fdsa
+                INNER JOIN lifo ON fifo
+                INNER JOIN hatful ON hallow
+            })
+          end
+
+          adapter_is_not :mysql do
+            sql.should be_like(%Q{
+              SELECT "users"."id", "users"."name"
+              FROM "users"
+                INNER JOIN asdf ON fdsa
+                INNER JOIN lifo ON fifo
+                INNER JOIN hatful ON hallow
+            })
+          end
+        end
+
+    end
+
+
     end
   end
 end

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

@@ -44,6 +44,25 @@ module Arel
           })
         end
       end
+
+      it "does not apply alias if it's same as the table name" do
+        sql = @relation.as(:users).to_sql
+
+        adapter_is :mysql do
+          sql.should be_like(%Q{
+            SELECT `users`.`id`, `users`.`name`
+            FROM `users`
+          })
+        end
+
+        adapter_is_not :mysql do
+          sql.should be_like(%Q{
+            SELECT "users"."id", "users"."name"
+            FROM "users"
+          })
+        end
+      end
+
     end
 
     describe '#column_for' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: arel
 version: !ruby/object:Gem::Version 
-  version: 0.2.pre
+  version: 0.2.0
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -05:00
+date: 2010-01-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -194,9 +194,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
   version: 
 requirements: []