arel 0.1.0 → 0.2.0

data/spec/arel/engines/sql/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/engines/sql/unit/primitives/literal_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe SqlLiteral do
@@ -18,6 +18,18 @@ module Arel
           sql.should be_like(%Q{SELECT COUNT(*) AS count_id FROM "users"})
         end
       end
+
+      it "manufactures expressions on literal SQL fragment" do
+        sql = @relation.project(SqlLiteral.new("2 * credit_limit").sum).to_sql
+
+        adapter_is :mysql do
+          sql.should be_like(%Q{SELECT SUM(2 * credit_limit) AS sum_id FROM `users`})
+        end
+
+        adapter_is_not :mysql do
+          sql.should be_like(%Q{SELECT SUM(2 * credit_limit) AS sum_id FROM "users"})
+        end
+      end
     end
   end
 end

data/spec/arel/engines/sql/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
@@ -9,11 +9,11 @@ module Arel
     describe '#to_sql' do
       it "appropriately quotes the value" do
         Value.new(1, @relation).to_sql.should be_like('1')
-        
+
         adapter_is_not :postgresql do
           Value.new('asdf', @relation).to_sql.should be_like("'asdf'")
         end
-        
+
         adapter_is :postgresql do
           Value.new('asdf', @relation).to_sql.should be_like("E'asdf'")
         end

data/spec/arel/engines/sql/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

data/spec/arel/engines/sql/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/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/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/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/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/engines/sql/unit/relations/join_spec.rb

@@ -1,17 +1,24 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
   describe Join do
     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
@@ -51,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/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/order_spec.rb

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

data/spec/arel/engines/sql/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/engines/sql/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/engines/sql/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
@@ -26,6 +26,45 @@ 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
+
+      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
       it "returns the column corresponding to the attribute" do
         @relation.column_for(@relation[:id]).should == @relation.columns.detect { |c| c.name == 'id' }
@@ -42,8 +81,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/arel/engines/sql/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/engines/sql/unit/relations/update_spec.rb

@@ -1,4 +1,10 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
+
+class User
+  def self.primary_key
+    "id"
+  end
+end
 
 module Arel
   describe Update do
@@ -45,17 +51,17 @@ module Arel
 
         adapter_is :sqlite3 do
           sql.should be_like(%Q{
-            UPDATE "users"
-            SET "name" = 'nick'
-            LIMIT 1
+            UPDATE "users" SET
+            "name" = 'nick'
+            WHERE "id" IN (SELECT "id" FROM "users"  LIMIT 1)
           })
         end
 
         adapter_is :postgresql do
           sql.should be_like(%Q{
-            UPDATE "users"
-            SET "name" = E'nick'
-            LIMIT 1
+            UPDATE "users" SET
+            "name" = E'nick'
+            WHERE "id" IN (SELECT "id" FROM "users"  LIMIT 1)
           })
         end
       end

data/spec/arel/engines/sql/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/connections/mysql_connection.rb

@@ -1,13 +1,13 @@
-require "rubygems"
-require "activerecord"
 puts "Using native MySQL"
+require "active_record"
+require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
 ActiveRecord::Base.configurations = {
   'unit' => {
     :adapter  => 'mysql',
-    :username => 'rails',
+    :username => 'root',
     :encoding => 'utf8',
     :database => 'arel_unit',
   }

data/spec/connections/postgresql_connection.rb

@@ -1,6 +1,6 @@
-require "rubygems"
-require "activerecord"
 puts "Using native PostgreSQL"
+require "active_record"
+require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")
 

data/spec/connections/sqlite3_connection.rb

@@ -1,6 +1,6 @@
-require "rubygems"
-require "activerecord"
 puts "Using native SQLite3"
+require "active_record"
+require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
@@ -16,6 +16,7 @@ ActiveRecord::Base.configurations = {
 
 unless File.exist?(db_file)
   puts "SQLite3 database not found at #{db_file}. Rebuilding it."
+  require 'fileutils'
   FileUtils.mkdir_p(File.dirname(db_file))
   sqlite_command = %Q{sqlite3 "#{db_file}" "create table a (a integer); drop table a;"}
   puts "Executing '#{sqlite_command}'"

data/spec/doubles/hash.rb

@@ -3,18 +3,22 @@ class Hash
     to_a.sort { |(key1, value1), (key2, value2)| key1.hash <=> key2.hash }
   end
 
+  undef :keys
   def keys
     ordered_array.collect(&:first)
   end
 
+  undef :values
   def values
     ordered_array.collect { |_, v| v }
   end
 
+  undef :each
   def each(&block)
     ordered_array.each(&block)
   end
 
+  undef :shift
   def shift
     returning to_a.first do |k, v|
       delete(k)

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.opts

@@ -0,0 +1,3 @@
+--backtrace
+--diff
+--color

data/spec/spec_helper.rb

@@ -37,10 +37,18 @@ module AdapterGuards
   end
 end
 
+module Check
+  # This is used to eliminate Ruby warnings on some RSpec assertion lines
+  # See: https://rspec.lighthouseapp.com/projects/5645/tickets/504
+  def check(*args)
+  end
+end
+
 Spec::Runner.configure do |config|
   config.include BeLikeMatcher, HashTheSameAsMatcher, DisambiguateAttributesMatcher
   config.include AdapterGuards
-  config.mock_with :rr
+  config.include Check
+
   config.before do
     Arel::Table.engine = Arel::Sql::Engine.new(ActiveRecord::Base)
   end