arel 0.1.2 → 0.2.pre

data/History.txt

@@ -0,0 +1,11 @@
+== Git
+
+* 1 major enhancement
+
+  * Ruby 1.9 compatibility
+
+== 0.1.0 / 2009-08-06
+
+* 1 major enhancement
+
+  * Birthday!

data/Rakefile

@@ -36,7 +36,7 @@ else
   end
 
   desc "Run specs with mysql and sqlite3 database adapters (default)"
-  task :spec => ["check_dependencies", "spec:sqlite3", "spec:mysql", "spec:postgresql"]
+  task :spec => ["spec:sqlite3", "spec:mysql", "spec:postgresql"]
 
   desc "Default task is to run specs"
   task :default => :spec

data/Thorfile

@@ -1,3 +1,5 @@
+require "activerecord"
+
 module GemHelpers
 
   def generate_gemspec
@@ -30,7 +32,7 @@ and query generation.
       s.test_files = normalize_files(Dir['spec/**/*.rb'] - repo.lib.ignored_files)
 
       s.has_rdoc = true
-      s.extra_rdoc_files = %w[README.markdown]
+      s.extra_rdoc_files = %w[History.txt README.markdown]
 
       # Arel required ActiveRecord, but we're not declaring it to avoid a
       # circular dependency chain. The solution is for ActiveRecord to release

data/arel.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arel}
-  s.version = "0.1.2"
+  s.version = "0.2.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp", "Nick Kallen"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2010-01-08}
   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
@@ -14,11 +14,13 @@ innovative object and collection modeling as opposed to database compatibility
 and query generation.}
   s.email = %q{bryan@brynary.com}
   s.extra_rdoc_files = [
+    "History.txt",
     "README.markdown"
   ]
   s.files = [
     ".gitignore",
     ".gitmodules",
+    "History.txt",
     "README.markdown",
     "Rakefile",
     "Thorfile",
@@ -38,8 +40,11 @@ and query generation.}
     "lib/arel/algebra/predicates.rb",
     "lib/arel/algebra/relations.rb",
     "lib/arel/algebra/relations/operations/alias.rb",
+    "lib/arel/algebra/relations/operations/from.rb",
     "lib/arel/algebra/relations/operations/group.rb",
+    "lib/arel/algebra/relations/operations/having.rb",
     "lib/arel/algebra/relations/operations/join.rb",
+    "lib/arel/algebra/relations/operations/lock.rb",
     "lib/arel/algebra/relations/operations/order.rb",
     "lib/arel/algebra/relations/operations/project.rb",
     "lib/arel/algebra/relations/operations/skip.rb",
@@ -127,9 +132,12 @@ and query generation.}
     "spec/arel/engines/sql/unit/primitives/value_spec.rb",
     "spec/arel/engines/sql/unit/relations/alias_spec.rb",
     "spec/arel/engines/sql/unit/relations/delete_spec.rb",
+    "spec/arel/engines/sql/unit/relations/from_spec.rb",
     "spec/arel/engines/sql/unit/relations/group_spec.rb",
+    "spec/arel/engines/sql/unit/relations/having_spec.rb",
     "spec/arel/engines/sql/unit/relations/insert_spec.rb",
     "spec/arel/engines/sql/unit/relations/join_spec.rb",
+    "spec/arel/engines/sql/unit/relations/lock_spec.rb",
     "spec/arel/engines/sql/unit/relations/order_spec.rb",
     "spec/arel/engines/sql/unit/relations/project_spec.rb",
     "spec/arel/engines/sql/unit/relations/skip_spec.rb",
@@ -199,9 +207,12 @@ and query generation.}
     "spec/arel/engines/sql/unit/primitives/value_spec.rb",
     "spec/arel/engines/sql/unit/relations/alias_spec.rb",
     "spec/arel/engines/sql/unit/relations/delete_spec.rb",
+    "spec/arel/engines/sql/unit/relations/from_spec.rb",
     "spec/arel/engines/sql/unit/relations/group_spec.rb",
+    "spec/arel/engines/sql/unit/relations/having_spec.rb",
     "spec/arel/engines/sql/unit/relations/insert_spec.rb",
     "spec/arel/engines/sql/unit/relations/join_spec.rb",
+    "spec/arel/engines/sql/unit/relations/lock_spec.rb",
     "spec/arel/engines/sql/unit/relations/order_spec.rb",
     "spec/arel/engines/sql/unit/relations/project_spec.rb",
     "spec/arel/engines/sql/unit/relations/skip_spec.rb",

data/lib/arel.rb

@@ -2,13 +2,10 @@ require 'active_support/inflector'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/class/attribute_accessors'
 
-require 'active_record'
-require 'active_record/connection_adapters/abstract/quoting'
-
 module Arel
   require 'arel/algebra'
   require 'arel/engines'
   autoload :Session, 'arel/session'
 
-  VERSION = "0.1.2"
+  VERSION = "0.2.pre"
 end

data/lib/arel/algebra/relations.rb

@@ -5,10 +5,13 @@ require 'arel/algebra/relations/utilities/externalization'
 require 'arel/algebra/relations/row'
 require 'arel/algebra/relations/writes'
 require 'arel/algebra/relations/operations/alias'
+require 'arel/algebra/relations/operations/from'
 require 'arel/algebra/relations/operations/group'
+require 'arel/algebra/relations/operations/having'
 require 'arel/algebra/relations/operations/join'
 require 'arel/algebra/relations/operations/order'
 require 'arel/algebra/relations/operations/project'
 require 'arel/algebra/relations/operations/where'
 require 'arel/algebra/relations/operations/skip'
 require 'arel/algebra/relations/operations/take'
+require 'arel/algebra/relations/operations/lock'

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

@@ -0,0 +1,6 @@
+module Arel
+  class From < Compound
+    attributes :relation, :sources
+    deriving :initialize, :==
+  end
+end

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

@@ -0,0 +1,13 @@
+module Arel
+  class Having < Compound
+    attributes :relation, :havings
+    deriving :==
+
+    def initialize(relation, *havings, &block)
+      @relation = relation
+      @havings = (havings + arguments_from_block(relation, &block)) \
+        .collect { |g| g.bind(relation) }
+    end
+  end
+end
+

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

@@ -0,0 +1,12 @@
+module Arel
+  class Lock < Compound
+    attributes :relation, :locked
+    deriving :initialize, :==
+
+    def initialize(relation, locked, &block)
+      @relation = relation
+      @locked   = locked.blank? ? " FOR UPDATE" : locked
+    end
+  end
+end
+

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

@@ -14,7 +14,7 @@ module Arel
     end
 
     def externalizable?
-      attributes.any?(&:aggregation?) or relation.externalizable?
+      attributes.any? { |a| a.respond_to?(:aggregation?) && a.aggregation? } || relation.externalizable?
     end
   end
 end

data/lib/arel/algebra/relations/relation.rb

@@ -43,7 +43,7 @@ module Arel
         join(other_relation, OuterJoin)
       end
 
-      [:where, :project, :order, :take, :skip, :group].each do |operation_name|
+      [:where, :project, :order, :take, :skip, :group, :from, :having].each do |operation_name|
         class_eval <<-OPERATION, __FILE__, __LINE__
           def #{operation_name}(*arguments, &block)
             arguments.all?(&:blank?) && !block_given?? self : #{operation_name.to_s.classify}.new(self, *arguments, &block)
@@ -51,6 +51,10 @@ module Arel
         OPERATION
       end
 
+      def lock(locking = nil)
+        Lock.new(self, locking)
+      end
+
       def alias
         Alias.new(self)
       end
@@ -127,9 +131,12 @@ module Arel
       def orders;                 []  end
       def inserts;                []  end
       def groupings;              []  end
+      def havings;                []  end
       def joins(formatter = nil); nil end # FIXME
       def taken;                  nil end
       def skipped;                nil end
+      def sources;                []  end
+      def locked;                 []  end
     end
     include DefaultOperations
   end

data/lib/arel/algebra/relations/utilities/compound.rb

@@ -2,10 +2,10 @@ module Arel
   class Compound < Relation
     attr_reader :relation
     delegate :joins, :join?, :inserts, :taken, :skipped, :name, :externalizable?,
-             :column_for, :engine,
+             :column_for, :engine, :sources, :locked, :table_alias,
              :to => :relation
 
-    [:attributes, :wheres, :groupings, :orders].each do |operation_name|
+    [:attributes, :wheres, :groupings, :orders, :havings].each do |operation_name|
       class_eval <<-OPERATION, __FILE__, __LINE__
         def #{operation_name}
           @#{operation_name} ||= relation.#{operation_name}.collect { |o| o.bind(self) }

data/lib/arel/engines/memory/relations/operations.rb

@@ -32,6 +32,12 @@ module Arel
     end
   end
 
+  class From < Compound
+    def eval
+      unoperated_rows[sources..-1]
+    end
+  end
+
   class Group < Compound
     def eval
       raise NotImplementedError

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

@@ -4,7 +4,8 @@ module Arel
       def name_for(relation)
         @used_names ||= Hash.new(0)
         (@relation_names ||= Hash.new do |hash, relation|
-          @used_names[name = relation.name] += 1
+          name =  relation.table_alias ? relation.table_alias : relation.name
+          @used_names[name] += 1
           hash[relation] = name + (@used_names[name] > 1 ? "_#{@used_names[name]}" : '')
         end)[relation.table]
       end

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

@@ -57,6 +57,12 @@ module Arel
       end
     end
 
+    class HavingClause < PassThrough
+      def attribute(attribute)
+        attribute
+      end
+    end
+
     class WhereCondition < Formatter
       def attribute(attribute)
         "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}"

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

@@ -12,11 +12,13 @@ module Arel
         order = order.zip((0...order.size).to_a).map { |s,i| "id_list.alias_#{i} #{'DESC' if s =~ /\bdesc$/i}" }.join(', ')
 
         query = build_query \
-          "SELECT     #{select_clauses.to_s}",
-          "FROM       #{table_sql(Sql::TableReference.new(self))}",
+          "SELECT     #{select_clauses.kind_of?(::Array) ? select_clauses.join("") : select_clauses.to_s}",
+          "FROM       #{from_clauses}",
           (joins(self)                                   unless joins(self).blank? ),
-          ("WHERE     #{where_clauses.join("\n\tAND ")}" unless wheres.blank?      ),
-          ("GROUP BY  #{group_clauses.join(', ')}"       unless groupings.blank?   )
+          ("WHERE     #{where_clauses.join(" AND ")}"    unless wheres.blank?      ),
+          ("GROUP BY  #{group_clauses.join(', ')}"       unless groupings.blank?   ),
+          ("HAVING    #{having_clauses.join(', ')}"      unless havings.blank?   ),
+          ("#{locked}"                                   unless locked.blank?     )
 
         build_query \
           "SELECT * FROM (#{query}) AS id_list",
@@ -27,13 +29,15 @@ module Arel
       else
         build_query \
           "SELECT     #{select_clauses.join(', ')}",
-          "FROM       #{table_sql(Sql::TableReference.new(self))}",
+          "FROM       #{from_clauses}",
           (joins(self)                                   unless joins(self).blank? ),
-          ("WHERE     #{where_clauses.join("\n\tAND ")}" unless wheres.blank?      ),
+          ("WHERE     #{where_clauses.join(" AND ")}"    unless wheres.blank?      ),
           ("GROUP BY  #{group_clauses.join(', ')}"       unless groupings.blank?   ),
+          ("HAVING    #{having_clauses.join(', ')}"      unless havings.blank?     ),
           ("ORDER BY  #{order_clauses.join(', ')}"       unless orders.blank?      ),
           ("LIMIT     #{taken}"                          unless taken.blank?       ),
-          ("OFFSET    #{skipped}"                        unless skipped.blank?     )
+          ("OFFSET    #{skipped}"                        unless skipped.blank?     ),
+          ("#{locked}"                                   unless engine.adapter_name =~ /SQLite/ || locked.blank?)
       end
     end
 
@@ -48,7 +52,11 @@ module Arel
   protected
 
     def build_query(*parts)
-      parts.compact.join("\n")
+      parts.compact.join(" ")
+    end
+
+    def from_clauses
+      sources.blank? ? table_sql(Sql::TableReference.new(self)) : sources
     end
 
     def select_clauses
@@ -63,6 +71,10 @@ module Arel
       groupings.collect { |g| g.to_sql(Sql::GroupClause.new(self)) }
     end
 
+    def having_clauses
+      havings.collect { |g| g.to_sql(Sql::HavingClause.new(self)) }
+    end
+
     def order_clauses
       orders.collect { |o| o.to_sql(Sql::OrderClause.new(self)) }
     end

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

@@ -3,10 +3,22 @@ module Arel
     include Recursion::BaseCase
 
     cattr_accessor :engine
-    attr_reader :name, :engine
+    attr_reader :name, :engine, :table_alias, :options
 
-    def initialize(name, engine = Table.engine)
-      @name, @engine = name.to_s, engine
+    def initialize(name, options = {})
+      @name = name.to_s
+
+      if options.is_a?(Hash)
+        @options = options
+        @engine = options[:engine] || Table.engine
+        @table_alias = options[:as].to_s if options[:as].present?
+      else
+        @engine = options # Table.new('foo', engine)
+      end
+    end
+
+    def as(table_alias)
+      Table.new(name, options.merge(:as => table_alias))
     end
 
     def attributes

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

@@ -4,7 +4,7 @@ module Arel
       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
@@ -14,8 +14,19 @@ module Arel
       insertion_attributes_values_sql = if record.is_a?(Value)
         record.value
       else
-        build_query "(#{record.keys.collect { |key| engine.quote_column_name(key.name) }.join(', ')})",
-          "VALUES (#{record.collect { |key, value| key.format(value) }.join(', ')})"
+        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 \
@@ -37,9 +48,14 @@ module Arel
 
     def assignment_sql
       if assignments.respond_to?(:collect)
-        assignments.collect do |attribute, value|
+        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(",\n")
+        end.join(", ")
       else
         assignments.value
       end
@@ -47,7 +63,7 @@ module Arel
 
     def build_update_conditions_sql
       conditions = ""
-      conditions << " WHERE #{wheres.collect(&:to_sql).join('\n\tAND ')}" unless wheres.blank?
+      conditions << " WHERE #{wheres.collect(&:to_sql).join(' AND ')}" unless wheres.blank?
       conditions << " ORDER BY #{order_clauses.join(', ')}" unless orders.blank?
 
       unless taken.blank?

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

@@ -4,7 +4,7 @@ module Arel
   module Predicates
     describe Binary do
       before do
-        @relation = Table.new(:users)
+        @relation = Arel::Table.new(:users)
         @attribute1 = @relation[:id]
         @attribute2 = @relation[:name]
         class ConcreteBinary < Binary

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

@@ -4,8 +4,8 @@ module Arel
   module Predicates
     describe Equality do
       before do
-        @relation1 = Table.new(:users)
-        @relation2 = Table.new(:photos)
+        @relation1 = Arel::Table.new(:users)
+        @relation2 = Arel::Table.new(:photos)
         @attribute1 = @relation1[:id]
         @attribute2 = @relation2[:user_id]
       end

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

@@ -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
-        check @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/session/session_spec.rb

@@ -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/sql/unit/predicates/binary_spec.rb

@@ -10,7 +10,7 @@ module Arel
       end
 
       before do
-        @relation = Table.new(:users)
+        @relation = Arel::Table.new(:users)
         @attribute1 = @relation[:id]
         @attribute2 = @relation[:name]
       end

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

@@ -4,8 +4,8 @@ module Arel
   module Predicates
     describe Equality do
       before do
-        @relation1 = Table.new(:users)
-        @relation2 = Table.new(:photos)
+        @relation1 = Arel::Table.new(:users)
+        @relation2 = Arel::Table.new(:photos)
         @attribute1 = @relation1[:id]
         @attribute2 = @relation2[:user_id]
       end

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

@@ -4,7 +4,7 @@ module Arel
   module Predicates
     describe In do
       before do
-        @relation = Table.new(:users)
+        @relation = Arel::Table.new(:users)
         @attribute = @relation[:id]
       end
 

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

@@ -4,11 +4,11 @@ module Arel
   module Predicates
     describe Predicate do
       before do
-        @relation = Table.new(:users)
+        @relation = Arel::Table.new(:users)
         @attribute1 = @relation[:id]
         @attribute2 = @relation[:name]
-        @operand1 = Equality.new(@attribute1, 1)
-        @operand2 = Equality.new(@attribute2, "name")
+        @operand1 = Arel::Predicates::Equality.new(@attribute1, 1)
+        @operand2 = Arel::Predicates::Equality.new(@attribute2, "name")
       end
 
       describe "when being combined with another predicate with AND logic" do

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

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+module Arel
+  describe Table do
+    before do
+      @relation = Table.new(:users)
+    end
+
+    describe '#to_sql' do
+      it "manufactures a simple select query" do
+        sql = @relation.from("workers").to_sql
+
+        adapter_is :mysql do
+          sql.should be_like(%Q{
+            SELECT `users`.`id`, `users`.`name`
+            FROM workers
+          })
+        end
+
+        adapter_is_not :mysql do
+          sql.should be_like(%Q{
+            SELECT "users"."id", "users"."name"
+            FROM workers
+          })
+        end
+      end
+    end
+
+    describe '#to_sql' do
+      it "overrides and use last from clause given " do
+        sql = @relation.from("workers").from("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
+
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+module Arel
+  describe Having do
+    before do
+      @relation = Table.new(:developers)
+    end
+
+    describe '#to_sql' do
+      describe 'when given a predicate' do
+        it "manufactures sql with where clause conditions" do
+          sql = @relation.group(@relation[:department]).having("MIN(salary) > 1000").to_sql
+
+          adapter_is :mysql do
+            sql.should be_like(%Q{
+              SELECT `developers`.`id`, `developers`.`name`, `developers`.`salary`, `developers`.`department`
+              FROM `developers`
+              GROUP BY `developers`.`department`
+              HAVING MIN(salary) > 1000
+            })
+          end
+
+          adapter_is_not :mysql do
+            sql.should be_like(%Q{
+              SELECT "developers"."id", "developers"."name", "developers"."salary", "developers"."department"
+              FROM "developers"
+              GROUP BY "developers"."department"
+              HAVING MIN(salary) > 1000
+            })
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -5,13 +5,20 @@ module Arel
     before do
       @relation1 = Table.new(:users)
       @relation2 = Table.new(:photos)
-      @predicate = @relation1[:id].eq(@relation2[:user_id])
+      @predicate1 = @relation1[:id].eq(@relation2[:user_id])
+
+      @relation3 = Table.new(:users, :as => :super_users)
+      @relation4 = Table.new(:photos, :as => :super_photos)
+
+      @predicate2 = @relation3[:id].eq(@relation2[:user_id])
+      @predicate3 = @relation3[:id].eq(@relation4[:user_id])
     end
 
     describe '#to_sql' do
+
       describe 'when joining with another relation' do
         it 'manufactures sql joining the two tables on the predicate' do
-          sql = InnerJoin.new(@relation1, @relation2, @predicate).to_sql
+          sql = InnerJoin.new(@relation1, @relation2, @predicate1).to_sql
 
           adapter_is :mysql do
             sql.should be_like(%Q{
@@ -29,6 +36,51 @@ module Arel
             })
           end
         end
+
+        describe 'when joining with another relation with an aliased table' do
+          it 'manufactures sql joining the two tables on the predicate respecting table aliasing' do
+            sql = InnerJoin.new(@relation3, @relation2, @predicate2).to_sql
+
+            adapter_is :mysql do
+              sql.should be_like(%Q{
+                SELECT `super_users`.`id`, `super_users`.`name`, `photos`.`id`, `photos`.`user_id`, `photos`.`camera_id`
+                FROM `users` AS `super_users`
+                  INNER JOIN `photos` ON `super_users`.`id` = `photos`.`user_id`
+              })
+            end
+
+            adapter_is_not :mysql do
+              sql.should be_like(%Q{
+                SELECT "super_users"."id", "super_users"."name", "photos"."id", "photos"."user_id", "photos"."camera_id"
+                FROM "users" AS "super_users"
+                  INNER JOIN "photos" ON "super_users"."id" = "photos"."user_id"
+              })
+            end
+          end
+        end
+
+        describe 'when joining with two relations with aliased tables' do
+          it 'manufactures sql joining the two tables on the predicate respecting table aliasing' do
+            sql = InnerJoin.new(@relation3, @relation4, @predicate3).to_sql
+
+            adapter_is :mysql do
+              sql.should be_like(%Q{
+                SELECT `super_users`.`id`, `super_users`.`name`, `super_photos`.`id`, `super_photos`.`user_id`, `super_photos`.`camera_id`
+                FROM `users` AS `super_users`
+                  INNER JOIN `photos` AS `super_photos` ON `super_users`.`id` = `super_photos`.`user_id`
+              })
+            end
+
+            adapter_is_not :mysql do
+              sql.should be_like(%Q{
+                SELECT "super_users"."id", "super_users"."name", "super_photos"."id", "super_photos"."user_id", "super_photos"."camera_id"
+                FROM "users" AS "super_users"
+                  INNER JOIN "photos" AS "super_photos" ON "super_users"."id" = "super_photos"."user_id"
+              })
+            end
+          end
+        end
+
       end
 
       describe 'when joining with a string' do

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

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+module Arel
+  describe Lock do
+    before do
+      @relation = Table.new(:users)
+    end
+
+    describe '#to_sql' do
+      it "manufactures a simple select query lock" do
+        sql = @relation.lock.to_sql
+
+        adapter_is :mysql do
+          sql.should be_like(%Q{
+            SELECT `users`.`id`, `users`.`name`
+            FROM `users` FOR UPDATE
+          })
+        end
+
+        adapter_is :postgresql do
+          sql.should be_like(%Q{
+            SELECT "users"."id", "users"."name"
+            FROM "users" FOR UPDATE
+          })
+        end
+
+        adapter_is :sqlite3 do
+          sql.should be_like(%Q{
+            SELECT "users"."id", "users"."name"
+            FROM "users"
+          })
+        end
+      end
+
+      it "manufactures a select query locking with a given lock" do
+        sql = @relation.lock("LOCK IN SHARE MODE").to_sql
+
+        adapter_is :mysql do
+          sql.should be_like(%Q{
+            SELECT `users`.`id`, `users`.`name`
+            FROM `users` LOCK IN SHARE MODE
+          })
+        end
+
+        adapter_is :postgresql do
+          sql.should be_like(%Q{
+            SELECT "users"."id", "users"."name"
+            FROM "users" LOCK IN SHARE MODE
+          })
+        end
+
+        adapter_is :sqlite3 do
+          sql.should be_like(%Q{
+            SELECT "users"."id", "users"."name"
+            FROM "users"
+          })
+        end
+      end
+    end
+  end
+end

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

@@ -26,6 +26,26 @@ module Arel
       end
     end
 
+    describe '#as' do
+      it "manufactures a simple select query using aliases" do
+        sql = @relation.as(:super_users).to_sql
+
+        adapter_is :mysql do
+          sql.should be_like(%Q{
+            SELECT `super_users`.`id`, `super_users`.`name`
+            FROM `users` AS `super_users`
+          })
+        end
+
+        adapter_is_not :mysql do
+          sql.should be_like(%Q{
+            SELECT "super_users"."id", "super_users"."name"
+            FROM "users" AS "super_users"
+          })
+        end
+      end
+    end
+
     describe '#column_for' do
       it "returns the column corresponding to the attribute" do
         @relation.column_for(@relation[:id]).should == @relation.columns.detect { |c| c.name == 'id' }
@@ -42,8 +62,8 @@ module Arel
 
       describe '#reset' do
         it "reloads columns from the database" do
-          lambda { stub(@relation.engine).columns { [] } }.should_not change { @relation.attributes }
-          lambda { @relation.reset                       }.should     change { @relation.attributes }
+          lambda { @relation.engine.stub!(:columns => []) }.should_not change { @relation.attributes }
+          lambda { @relation.reset                        }.should     change { @relation.attributes }
         end
       end
     end

data/spec/schemas/mysql_schema.rb

@@ -11,6 +11,13 @@ sql = <<-SQL
     user_id INTEGER NOT NULL,
     camera_id INTEGER NOT NULL
   );
+  DROP TABLE IF EXISTS developers;
+  CREATE TABLE developers (
+    id INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    name VARCHAR(255) NOT NULL,
+    salary INTEGER NOT NULL,
+    department VARCHAR(255) NOT NULL
+  );
 SQL
 
 sql.split(/;/).select(&:present?).each do |sql_statement|

data/spec/schemas/postgresql_schema.rb

@@ -11,6 +11,13 @@ sql = <<-SQL
     user_id INTEGER NOT NULL,
     camera_id INTEGER NOT NULL
   );
+  DROP TABLE IF EXISTS developers;
+  CREATE TABLE developers (
+    id SERIAL PRIMARY KEY NOT NULL,
+    name VARCHAR(255) NOT NULL,
+    salary INTEGER NOT NULL,
+    department VARCHAR(255) NOT NULL
+  );
 SQL
 
 sql.split(/;/).select(&:present?).each do |sql_statement|

data/spec/schemas/sqlite3_schema.rb

@@ -11,6 +11,13 @@ sql = <<-SQL
     user_id INTEGER NOT NULL,
     camera_id INTEGER NOT NULL
   );
+  DROP TABLE IF EXISTS developers;
+  CREATE TABLE developers (
+    id INTEGER NOT NULL PRIMARY KEY,
+    name VARCHAR(255) NOT NULL,
+    salary INTEGER NOT NULL,
+    department VARCHAR(255) NOT NULL
+  );
 SQL
 
 sql.split(/;/).select(&:present?).each do |sql_statement|

data/spec/spec_helper.rb

@@ -48,7 +48,7 @@ Spec::Runner.configure do |config|
   config.include BeLikeMatcher, HashTheSameAsMatcher, DisambiguateAttributesMatcher
   config.include AdapterGuards
   config.include Check
-  config.mock_with :rr
+
   config.before do
     Arel::Table.engine = Arel::Sql::Engine.new(ActiveRecord::Base)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: arel
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.pre
 platform: ruby
 authors: 
 - Bryan Helmkamp
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -04:00
+date: 2010-01-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,10 +35,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- History.txt
 - README.markdown
 files: 
 - .gitignore
 - .gitmodules
+- History.txt
 - README.markdown
 - Rakefile
 - Thorfile
@@ -58,8 +60,11 @@ files:
 - lib/arel/algebra/predicates.rb
 - lib/arel/algebra/relations.rb
 - lib/arel/algebra/relations/operations/alias.rb
+- lib/arel/algebra/relations/operations/from.rb
 - lib/arel/algebra/relations/operations/group.rb
+- lib/arel/algebra/relations/operations/having.rb
 - lib/arel/algebra/relations/operations/join.rb
+- lib/arel/algebra/relations/operations/lock.rb
 - lib/arel/algebra/relations/operations/order.rb
 - lib/arel/algebra/relations/operations/project.rb
 - lib/arel/algebra/relations/operations/skip.rb
@@ -147,9 +152,12 @@ files:
 - spec/arel/engines/sql/unit/primitives/value_spec.rb
 - spec/arel/engines/sql/unit/relations/alias_spec.rb
 - spec/arel/engines/sql/unit/relations/delete_spec.rb
+- spec/arel/engines/sql/unit/relations/from_spec.rb
 - spec/arel/engines/sql/unit/relations/group_spec.rb
+- spec/arel/engines/sql/unit/relations/having_spec.rb
 - spec/arel/engines/sql/unit/relations/insert_spec.rb
 - spec/arel/engines/sql/unit/relations/join_spec.rb
+- spec/arel/engines/sql/unit/relations/lock_spec.rb
 - spec/arel/engines/sql/unit/relations/order_spec.rb
 - spec/arel/engines/sql/unit/relations/project_spec.rb
 - spec/arel/engines/sql/unit/relations/skip_spec.rb
@@ -186,9 +194,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
@@ -241,9 +249,12 @@ test_files:
 - spec/arel/engines/sql/unit/primitives/value_spec.rb
 - spec/arel/engines/sql/unit/relations/alias_spec.rb
 - spec/arel/engines/sql/unit/relations/delete_spec.rb
+- spec/arel/engines/sql/unit/relations/from_spec.rb
 - spec/arel/engines/sql/unit/relations/group_spec.rb
+- spec/arel/engines/sql/unit/relations/having_spec.rb
 - spec/arel/engines/sql/unit/relations/insert_spec.rb
 - spec/arel/engines/sql/unit/relations/join_spec.rb
+- spec/arel/engines/sql/unit/relations/lock_spec.rb
 - spec/arel/engines/sql/unit/relations/order_spec.rb
 - spec/arel/engines/sql/unit/relations/project_spec.rb
 - spec/arel/engines/sql/unit/relations/skip_spec.rb