arel 0.1.0 → 0.1.2

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

@@ -1,83 +1,85 @@
-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]
-    end
+  module Predicates
+    describe In do
+      before do
+        @relation = Table.new(:users)
+        @attribute = @relation[:id]
+      end
 
-    describe '#to_sql' do
-      describe 'when relating to an array' do
-        describe 'when the array\'s elements are the same type as the attribute' do
-          before do
-            @array = [1, 2, 3]
-          end
+      describe '#to_sql' do
+        describe 'when relating to an array' do
+          describe 'when the array\'s elements are the same type as the attribute' do
+            before do
+              @array = [1, 2, 3]
+            end
 
-          it 'manufactures sql with a comma separated list' do
-            sql = In.new(@attribute, @array).to_sql
+            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 (1, 2, 3)})
+              adapter_is :mysql do
+                sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)})
+              end
+
+              adapter_is_not :mysql do
+                sql.should be_like(%Q{"users"."id" IN (1, 2, 3)})
+              end
             end
+          end
 
-            adapter_is_not :mysql do
-              sql.should be_like(%Q{"users"."id" IN (1, 2, 3)})
+          describe 'when the array\'s elements are not same type as the attribute' do
+            before do
+              @array = ['1-asdf', 2, 3]
+            end
+
+            it 'formats values in the array as the type of the attribute' do
+              sql = In.new(@attribute, @array).to_sql
+
+              adapter_is :mysql do
+                sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)})
+              end
+
+              adapter_is_not :mysql do
+                sql.should be_like(%Q{"users"."id" IN (1, 2, 3)})
+              end
             end
           end
         end
 
-        describe 'when the array\'s elements are not same type as the attribute' do
+        describe 'when relating to a range' do
           before do
-            @array = ['1-asdf', 2, 3]
+            @range = 1..2
           end
 
-          it 'formats values in the array as the type of the attribute' do
-            sql = In.new(@attribute, @array).to_sql
+          it 'manufactures sql with a between' do
+            sql = In.new(@attribute, @range).to_sql
 
             adapter_is :mysql do
-              sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)})
+              sql.should be_like(%Q{`users`.`id` BETWEEN 1 AND 2})
             end
 
             adapter_is_not :mysql do
-              sql.should be_like(%Q{"users"."id" IN (1, 2, 3)})
+              sql.should be_like(%Q{"users"."id" BETWEEN 1 AND 2})
             end
           end
         end
-      end
-
-      describe 'when relating to a range' do
-        before do
-          @range = 1..2
-        end
-
-        it 'manufactures sql with a between' do
-          sql = In.new(@attribute, @range).to_sql
-
-          adapter_is :mysql do
-            sql.should be_like(%Q{`users`.`id` BETWEEN 1 AND 2})
-          end
-
-          adapter_is_not :mysql do
-            sql.should be_like(%Q{"users"."id" BETWEEN 1 AND 2})
-          end
-        end
-      end
 
-      describe 'when relating to a relation' do
-        it 'manufactures sql with a subselect' do
-          sql = In.new(@attribute, @relation).to_sql
+        describe 'when relating to a relation' do
+          it 'manufactures sql with a subselect' do
+            sql = In.new(@attribute, @relation).to_sql
 
-          adapter_is :mysql do
-            sql.should be_like(%Q{
-              `users`.`id` IN (SELECT `users`.`id`, `users`.`name` FROM `users`)
-            })
-          end
+            adapter_is :mysql do
+              sql.should be_like(%Q{
+                `users`.`id` IN (SELECT `users`.`id`, `users`.`name` FROM `users`)
+              })
+            end
 
-          adapter_is_not :mysql do
-            sql.should be_like(%Q{
-              "users"."id" IN (SELECT "users"."id", "users"."name" FROM "users")
-            })
+            adapter_is_not :mysql do
+              sql.should be_like(%Q{
+                "users"."id" IN (SELECT "users"."id", "users"."name" FROM "users")
+              })
+            end
           end
         end
       end

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

@@ -1,62 +1,64 @@
-require File.join(File.dirname(__FILE__), '..', '..', '..', '..', '..', 'spec_helper')
+require 'spec_helper'
 
 module Arel
-  describe Predicate do
-    before do
-      @relation = Table.new(:users)
-      @attribute1 = @relation[:id]
-      @attribute2 = @relation[:name]
-      @operand1 = Equality.new(@attribute1, 1)
-      @operand2 = Equality.new(@attribute2, "name")
-    end
+  module Predicates
+    describe Predicate do
+      before do
+        @relation = Table.new(:users)
+        @attribute1 = @relation[:id]
+        @attribute2 = @relation[:name]
+        @operand1 = Equality.new(@attribute1, 1)
+        @operand2 = Equality.new(@attribute2, "name")
+      end
 
-    describe "when being combined with another predicate with AND logic" do
-      describe "#to_sql" do
-        it "manufactures sql with an AND operation" do
-          sql = @operand1.and(@operand2).to_sql
+      describe "when being combined with another predicate with AND logic" do
+        describe "#to_sql" do
+          it "manufactures sql with an AND operation" do
+            sql = @operand1.and(@operand2).to_sql
 
-          adapter_is :mysql do
-            sql.should be_like(%Q{
-              (`users`.`id` = 1 AND `users`.`name` = 'name')
-            })
-          end
+            adapter_is :mysql do
+              sql.should be_like(%Q{
+                (`users`.`id` = 1 AND `users`.`name` = 'name')
+              })
+            end
 
-          adapter_is :sqlite3 do
-            sql.should be_like(%Q{
-              ("users"."id" = 1 AND "users"."name" = 'name')
-            })
-          end
+            adapter_is :sqlite3 do
+              sql.should be_like(%Q{
+                ("users"."id" = 1 AND "users"."name" = 'name')
+              })
+            end
 
-          adapter_is :postgresql do
-            sql.should be_like(%Q{
-              ("users"."id" = 1 AND "users"."name" = E'name')
-            })
+            adapter_is :postgresql do
+              sql.should be_like(%Q{
+                ("users"."id" = 1 AND "users"."name" = E'name')
+              })
+            end
           end
         end
       end
-    end
 
-    describe "when being combined with another predicate with OR logic" do
-      describe "#to_sql" do
-        it "manufactures sql with an OR operation" do
-          sql = @operand1.or(@operand2).to_sql
+      describe "when being combined with another predicate with OR logic" do
+        describe "#to_sql" do
+          it "manufactures sql with an OR operation" do
+            sql = @operand1.or(@operand2).to_sql
 
-          adapter_is :mysql do
-            sql.should be_like(%Q{
-              (`users`.`id` = 1 OR `users`.`name` = 'name')
-            })
-          end
+            adapter_is :mysql do
+              sql.should be_like(%Q{
+                (`users`.`id` = 1 OR `users`.`name` = 'name')
+              })
+            end
 
-          adapter_is :sqlite3 do
-            sql.should be_like(%Q{
-              ("users"."id" = 1 OR "users"."name" = 'name')
-            })
-          end
+            adapter_is :sqlite3 do
+              sql.should be_like(%Q{
+                ("users"."id" = 1 OR "users"."name" = 'name')
+              })
+            end
 
-          adapter_is :postgresql do
-            sql.should be_like(%Q{
-              ("users"."id" = 1 OR "users"."name" = E'name')
-            })
+            adapter_is :postgresql do
+              sql.should be_like(%Q{
+                ("users"."id" = 1 OR "users"."name" = E'name')
+              })
+            end
           end
         end
       end

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

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

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

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")