arel 0.1.0 → 0.2.0

data/lib/arel/engines/sql/relations/utilities/compound.rb

@@ -3,7 +3,7 @@ module Arel
     delegate :table, :table_sql, :to => :relation
 
     def build_query(*parts)
-      parts.compact.join("\n")
+      parts.compact.join(" ")
     end
   end
 end

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

@@ -1,39 +1,86 @@
 module Arel
   class Deletion < Compound
-    def to_sql(formatter = nil)
+    def to_sql
       build_query \
         "DELETE",
         "FROM #{table_sql}",
-        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}" unless wheres.blank? ),
+        ("WHERE #{wheres.collect(&:to_sql).join(' AND ')}" unless wheres.blank? ),
         ("LIMIT #{taken}"                                     unless taken.blank?  )
     end
   end
 
   class Insert < Compound
-    def to_sql(formatter = nil)
+    def to_sql
+      insertion_attributes_values_sql = if record.is_a?(Value)
+        record.value
+      else
+        attributes = record.keys.sort_by do |attribute|
+          attribute.name.to_s
+        end
+
+        first = attributes.collect do |key|
+          engine.quote_column_name(key.name)
+        end.join(', ')
+
+        second = attributes.collect do |key|
+          key.format(record[key])
+        end.join(', ')
+
+        build_query "(#{first})", "VALUES (#{second})"
+      end
+
       build_query \
         "INSERT",
         "INTO #{table_sql}",
-        "(#{record.keys.collect { |key| engine.quote_column_name(key.name) }.join(', ')})",
-        "VALUES (#{record.collect { |key, value| key.format(value) }.join(', ')})"
+        insertion_attributes_values_sql
     end
   end
 
   class Update < Compound
-    def to_sql(formatter = nil)
+    def to_sql
       build_query \
         "UPDATE #{table_sql} SET",
         assignment_sql,
-        ("WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}"  unless wheres.blank? ),
-        ("LIMIT #{taken}"                                      unless taken.blank?  )
+        build_update_conditions_sql
     end
 
   protected
 
     def assignment_sql
-      assignments.collect do |attribute, value|
-        "#{engine.quote_column_name(attribute.name)} = #{attribute.format(value)}"
-      end.join(",\n")
+      if assignments.respond_to?(:collect)
+        attributes = assignments.keys.sort_by do |attribute|
+          attribute.name.to_s
+        end
+
+        attributes.map do |attribute|
+          value = assignments[attribute]
+          "#{engine.quote_column_name(attribute.name)} = #{attribute.format(value)}"
+        end.join(", ")
+      else
+        assignments.value
+      end
+    end
+
+    def build_update_conditions_sql
+      conditions = ""
+      conditions << " WHERE #{wheres.collect(&:to_sql).join(' AND ')}" unless wheres.blank?
+      conditions << " ORDER BY #{order_clauses.join(', ')}" unless orders.blank?
+
+      unless taken.blank?
+        conditions << " LIMIT #{taken}"
+
+        if engine.adapter_name != "MySQL"
+          begin
+            quote_primary_key = engine.quote_column_name(table.name.classify.constantize.primary_key)
+          rescue NameError
+            quote_primary_key = engine.quote_column_name("id")
+          end
+
+          conditions =  "WHERE #{quote_primary_key} IN (SELECT #{quote_primary_key} FROM #{engine.connection.quote_table_name table.name} #{conditions})"
+        end
+      end
+
+      conditions
     end
   end
 end

data/lib/arel/engines/sql.rb

@@ -3,5 +3,5 @@ require 'arel/engines/sql/relations'
 require 'arel/engines/sql/primitives'
 require 'arel/engines/sql/predicates'
 require 'arel/engines/sql/formatters'
-require 'arel/engines/sql/extensions'
+require 'arel/engines/sql/core_extensions'
 require 'arel/engines/sql/christener'

data/lib/arel/session.rb

@@ -5,16 +5,22 @@ module Arel
       alias_method :manufacture, :new
 
       def start
-        if @started
+        if defined?(@started) && @started
           yield
         else
           begin
             @started = true
             @instance = manufacture
-            metaclass.send :alias_method, :new, :instance
+            metaclass.class_eval do
+              undef :new
+              alias_method :new, :instance
+            end
             yield
           ensure
-            metaclass.send :alias_method, :new, :manufacture
+            metaclass.class_eval do
+              undef :new
+              alias_method :new, :manufacture
+            end
             @started = false
           end
         end
@@ -24,7 +30,6 @@ module Arel
     module CRUD
       def create(insert)
         insert.call
-        insert
       end
 
       def read(select)
@@ -35,12 +40,10 @@ module Arel
 
       def update(update)
         update.call
-        update
       end
 
       def delete(delete)
         delete.call
-        delete
       end
     end
     include CRUD

data/lib/arel.rb

@@ -1,10 +1,11 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'active_support/inflector'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/class/attribute_accessors'
 
-require 'rubygems'
-require 'activesupport'
-require 'activerecord'
-require 'active_record/connection_adapters/abstract/quoting'
+module Arel
+  require 'arel/algebra'
+  require 'arel/engines'
+  autoload :Session, 'arel/session'
 
-require 'arel/algebra'
-require 'arel/engines'
-require 'arel/session'
+  VERSION = "0.2.0"
+end

data/spec/arel/algebra/unit/predicates/binary_spec.rb

@@ -1,31 +1,33 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
-  describe Binary do
-    before do
-      @relation = Table.new(:users)
-      @attribute1 = @relation[:id]
-      @attribute2 = @relation[:name]
-      class ConcreteBinary < Binary
-      end
-    end
-
-    describe '#bind' do
+  module Predicates
+    describe Binary do
       before do
-        @another_relation = @relation.alias
+        @relation = Arel::Table.new(:users)
+        @attribute1 = @relation[:id]
+        @attribute2 = @relation[:name]
+        class ConcreteBinary < Binary
+        end
       end
 
-      describe 'when both operands are attributes' do
-        it "manufactures an expression with the attributes bound to the relation" do
-          ConcreteBinary.new(@attribute1, @attribute2).bind(@another_relation). \
-            should == ConcreteBinary.new(@another_relation[@attribute1], @another_relation[@attribute2])
+      describe '#bind' do
+        before do
+          @another_relation = @relation.alias
+        end
+
+        describe 'when both operands are attributes' do
+          it "manufactures an expression with the attributes bound to the relation" do
+            ConcreteBinary.new(@attribute1, @attribute2).bind(@another_relation). \
+              should == ConcreteBinary.new(@another_relation[@attribute1], @another_relation[@attribute2])
+          end
         end
-      end
 
-      describe 'when an operand is a value' do
-        it "manufactures an expression with unmodified values" do
-          ConcreteBinary.new(@attribute1, "asdf").bind(@another_relation). \
-            should == ConcreteBinary.new(@attribute1.find_correlate_in(@another_relation), "asdf".find_correlate_in(@another_relation))
+        describe 'when an operand is a value' do
+          it "manufactures an expression with unmodified values" do
+            ConcreteBinary.new(@attribute1, "asdf").bind(@another_relation). \
+              should == ConcreteBinary.new(@attribute1.find_correlate_in(@another_relation), "asdf".find_correlate_in(@another_relation))
+          end
         end
       end
     end

data/spec/arel/algebra/unit/predicates/equality_spec.rb

@@ -1,26 +1,28 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
-  describe Equality do
-    before do
-      @relation1 = Table.new(:users)
-      @relation2 = Table.new(:photos)
-      @attribute1 = @relation1[:id]
-      @attribute2 = @relation2[:user_id]
-    end
-
-    describe '==' do
-      it "obtains if attribute1 and attribute2 are identical" do
-        Equality.new(@attribute1, @attribute2).should == Equality.new(@attribute1, @attribute2)
-        Equality.new(@attribute1, @attribute2).should_not == Equality.new(@attribute1, @attribute1)
+  module Predicates
+    describe Equality do
+      before do
+        @relation1 = Arel::Table.new(:users)
+        @relation2 = Arel::Table.new(:photos)
+        @attribute1 = @relation1[:id]
+        @attribute2 = @relation2[:user_id]
       end
 
-      it "obtains if the concrete type of the predicates are identical" do
-        Equality.new(@attribute1, @attribute2).should_not == Binary.new(@attribute1, @attribute2)
-      end
+      describe '==' do
+        it "obtains if attribute1 and attribute2 are identical" do
+          check Equality.new(@attribute1, @attribute2).should == Equality.new(@attribute1, @attribute2)
+          Equality.new(@attribute1, @attribute2).should_not == Equality.new(@attribute1, @attribute1)
+        end
+
+        it "obtains if the concrete type of the predicates are identical" do
+          Equality.new(@attribute1, @attribute2).should_not == Binary.new(@attribute1, @attribute2)
+        end
 
-      it "is commutative on the attributes" do
-        Equality.new(@attribute1, @attribute2).should == Equality.new(@attribute2, @attribute1)
+        it "is commutative on the attributes" do
+          Equality.new(@attribute1, @attribute2).should == Equality.new(@attribute2, @attribute1)
+        end
       end
     end
   end

data/spec/arel/algebra/unit/predicates/in_spec.rb

@@ -1,10 +1,12 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
-  describe In do
-    before do
-      @relation = Table.new(:users)
-      @attribute = @relation[:id]
+  module Predicates
+    describe In do
+      before do
+        @relation = Table.new(:users)
+        @attribute = @relation[:id]
+      end
     end
   end
 end

data/spec/arel/algebra/unit/primitives/attribute_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Attribute do
@@ -73,10 +73,8 @@ module Arel
 
         describe 'when dividing two matching attributes' do
           it 'returns a the highest score for the most similar attributes' do
-            (@aliased_relation[:id] / @relation[:id]) \
-              .should == (@aliased_relation[:id] / @relation[:id])
-            (@aliased_relation[:id] / @relation[:id]) \
-              .should < (@aliased_relation[:id] / @aliased_relation[:id])
+            check((@aliased_relation[:id] / @relation[:id]).should == (@aliased_relation[:id] / @relation[:id]))
+            (@aliased_relation[:id] / @relation[:id]).should < (@aliased_relation[:id] / @aliased_relation[:id])
           end
         end
       end
@@ -89,43 +87,43 @@ module Arel
 
       describe '#eq' do
         it "manufactures an equality predicate" do
-          @attribute.eq('name').should == Equality.new(@attribute, 'name')
+          @attribute.eq('name').should == Predicates::Equality.new(@attribute, 'name')
         end
       end
 
       describe '#lt' do
         it "manufactures a less-than predicate" do
-          @attribute.lt(10).should == LessThan.new(@attribute, 10)
+          @attribute.lt(10).should == Predicates::LessThan.new(@attribute, 10)
         end
       end
 
       describe '#lteq' do
         it "manufactures a less-than or equal-to predicate" do
-          @attribute.lteq(10).should == LessThanOrEqualTo.new(@attribute, 10)
+          @attribute.lteq(10).should == Predicates::LessThanOrEqualTo.new(@attribute, 10)
         end
       end
 
       describe '#gt' do
         it "manufactures a greater-than predicate" do
-          @attribute.gt(10).should == GreaterThan.new(@attribute, 10)
+          @attribute.gt(10).should == Predicates::GreaterThan.new(@attribute, 10)
         end
       end
 
       describe '#gteq' do
         it "manufactures a greater-than or equal-to predicate" do
-          @attribute.gteq(10).should == GreaterThanOrEqualTo.new(@attribute, 10)
+          @attribute.gteq(10).should == Predicates::GreaterThanOrEqualTo.new(@attribute, 10)
         end
       end
 
       describe '#matches' do
         it "manufactures a match predicate" do
-          @attribute.matches(/.*/).should == Match.new(@attribute, /.*/)
+          @attribute.matches(/.*/).should == Predicates::Match.new(@attribute, /.*/)
         end
       end
 
       describe '#in' do
         it "manufactures an in predicate" do
-          @attribute.in(1..30).should == In.new(@attribute, (1..30))
+          @attribute.in(1..30).should == Predicates::In.new(@attribute, (1..30))
         end
       end
     end

data/spec/arel/algebra/unit/primitives/expression_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Expression do

data/spec/arel/algebra/unit/primitives/value_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Value do

data/spec/arel/algebra/unit/relations/alias_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Alias do
@@ -8,7 +8,7 @@ module Arel
 
     describe '==' do
       it "obtains if the objects are the same" do
-        Alias.new(@relation).should_not == Alias.new(@relation)
+        check Alias.new(@relation).should_not == Alias.new(@relation)
         (aliaz = Alias.new(@relation)).should == aliaz
       end
     end

data/spec/arel/algebra/unit/relations/delete_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Deletion do

data/spec/arel/algebra/unit/relations/group_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Group do

data/spec/arel/algebra/unit/relations/insert_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Insert do

data/spec/arel/algebra/unit/relations/join_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Join do

data/spec/arel/algebra/unit/relations/order_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Order do
@@ -6,7 +6,7 @@ module Arel
       @relation = Table.new(:users)
       @attribute = @relation[:id]
     end
-    
+
     describe "#==" do
       it "returns true when the Orders are for the same attribute and direction" do
         Ascending.new(@attribute).should == Ascending.new(@attribute)

data/spec/arel/algebra/unit/relations/project_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Project do

data/spec/arel/algebra/unit/relations/relation_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Relation do
@@ -17,8 +17,8 @@ module Arel
 
       describe 'when given a', Symbol, String do
         it "returns the attribute with the same name, if it exists" do
-          @relation[:id].should == @attribute1
-          @relation['id'].should == @attribute1
+          check @relation[:id].should == @attribute1
+          check @relation['id'].should == @attribute1
           @relation[:does_not_exist].should be_nil
         end
       end
@@ -80,7 +80,7 @@ module Arel
 
       describe '#where' do
         before do
-          @predicate = Equality.new(@attribute1, @attribute2)
+          @predicate = Predicates::Equality.new(@attribute1, @attribute2)
         end
 
         it "manufactures a where relation" do
@@ -150,7 +150,7 @@ module Arel
         describe '#delete' do
           it 'manufactures a deletion relation' do
             Session.start do
-              mock(Session.new).delete(Deletion.new(@relation))
+              Session.new.should_receive(:delete).with(Deletion.new(@relation))
               @relation.delete
             end
           end
@@ -160,7 +160,7 @@ module Arel
           it 'manufactures an insertion relation' do
             Session.start do
               record = { @relation[:name] => 'carl' }
-              mock(Session.new).create(Insert.new(@relation, record))
+              Session.new.should_receive(:create).with(Insert.new(@relation, record))
               @relation.insert(record)
             end
           end
@@ -170,7 +170,7 @@ module Arel
           it 'manufactures an update relation' do
             Session.start do
               assignments = { @relation[:name] => Value.new('bob', @relation) }
-              mock(Session.new).update(Update.new(@relation, assignments))
+              Session.new.should_receive(:update).with(Update.new(@relation, assignments))
               @relation.update(assignments)
             end
           end
@@ -180,8 +180,8 @@ module Arel
 
     describe Relation::Enumerable do
       it "implements enumerable" do
-        @relation.collect.should == @relation.session.read(@relation).collect
-        @relation.first.should   == @relation.session.read(@relation).first
+        @relation.map { |value| value }.should ==
+        @relation.session.read(@relation).map { |value| value }
       end
     end
   end

data/spec/arel/algebra/unit/relations/skip_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Skip do

data/spec/arel/algebra/unit/relations/table_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Table do
@@ -9,7 +9,7 @@ module Arel
     describe '[]' do
       describe 'when given a', Symbol do
         it "manufactures an attribute if the symbol names an attribute within the relation" do
-          @relation[:id].should == Attribute.new(@relation, :id)
+          check @relation[:id].should == Attribute.new(@relation, :id)
           @relation[:does_not_exist].should be_nil
         end
       end

data/spec/arel/algebra/unit/relations/take_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Take do

data/spec/arel/algebra/unit/relations/update_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Update do

data/spec/arel/algebra/unit/relations/where_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Where do

data/spec/arel/algebra/unit/session/session_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Session do
@@ -40,19 +40,19 @@ module Arel
 
       describe '#create' do
         it "executes an insertion on the connection" do
-          mock(@insert).call
+          @insert.should_receive(:call)
           @session.create(@insert)
         end
       end
 
       describe '#read' do
         it "executes an selection on the connection" do
-          mock(@read).call
+          @read.should_receive(:call)
           @session.read(@read)
         end
 
         it "is memoized" do
-          mock(@read).call.once
+          @read.should_receive(:call).once
           @session.read(@read)
           @session.read(@read)
         end
@@ -60,14 +60,14 @@ module Arel
 
       describe '#update' do
         it "executes an update on the connection" do
-          mock(@update).call
+          @update.should_receive(:call)
           @session.update(@update)
         end
       end
 
       describe '#delete' do
         it "executes a delete on the connection" do
-          mock(@delete).call
+          @delete.should_receive(:call)
           @session.delete(@delete)
         end
       end

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

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Join do
@@ -10,9 +10,8 @@ module Arel
       ], [: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)
+      @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)
     end
 
     describe 'when the in memory relation is on the left' do

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

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Array do