Merge branch 'rals-4-arel' into rails-4

Conflicts:
	Rakefile

Author: Anna

Rakefile

@@ -1,13 +1,17 @@
 require 'rake'
 require 'rake/testtask'
 
+AR_PATH   = Gem.loaded_specs['activerecord'].full_gem_path
+AREL_PATH = Gem.loaded_specs['arel'].full_gem_path
 # Notes for cross compile:
 # $ gcla ; bundle install ; rake compile ; rake cross compile ; rake cross native gem
 
 def test_libs(mode='dblib')
   ['lib',
    'test',
-   "#{File.join(Gem.loaded_specs['activerecord'].full_gem_path,'test')}"]
+   "#{File.join(AR_PATH,'test')}",
+   "#{File.join(AREL_PATH,'test')}",
+ ]
 end
 
 # bundle exec rake test SQLSERVER_ONLY=true
@@ -16,18 +20,26 @@ end
 # http://veganswithtypewriters.net/blog/2013/06/29/weirdness-with-rake-solved/
 def test_files
   test_setup = ["test/cases/sqlserver_helper.rb"]
-  return test_setup+(ENV['TEST_FILES']).split(',').sort if ENV['TEST_FILES']
-  sqlserver_cases = Dir.glob("test/cases/**/*_test_sqlserver.rb").sort
-  ar_path = Gem.loaded_specs['activerecord'].full_gem_path
-  ar_cases = Dir.glob("#{ar_path}/test/cases/**/*_test.rb")
-  adapter_cases = Dir.glob("#{ar_path}/test/cases/adapters/**/*_test.rb")
+
+  return test_setup+(ENV['TEST_FILES']).split(',') if ENV['TEST_FILES']
+  
+  sqlserver_cases = Dir.glob("test/cases/**/*_test_sqlserver.rb")
+  
+  ar_cases = Dir.glob("#{AR_PATH}/test/cases/**/*_test.rb")
+  adapter_cases = Dir.glob("#{AR_PATH}/test/cases/adapters/**/*_test.rb")
+
+  arel_cases = Dir.glob("#{AREL_PATH}/test/**/test_*.rb")
+
   if ENV['SQLSERVER_ONLY']
     sqlserver_cases
   elsif ENV['ACTIVERECORD_ONLY']
-    test_setup + (ar_cases - adapter_cases).sort
+    test_setup + (ar_cases - adapter_cases)
+  elsif ENV['AREL_ONLY']
+    arel_cases
   else
-    sqlserver_cases + (ar_cases - adapter_cases).sort
+    test_setup + arel_cases + sqlserver_cases + (ar_cases - adapter_cases)
   end
+  
 end
 
 task :test => ['test:dblib']
@@ -81,5 +93,3 @@ namespace :profile do
   end
 
 end
-
-

test/cases/sqlserver_helper.rb

@@ -4,9 +4,12 @@
 SQLSERVER_MIGRATIONS_ROOT = File.expand_path(File.join(SQLSERVER_TEST_ROOT,'migrations'))
 SQLSERVER_SCHEMA_ROOT     = File.expand_path(File.join(SQLSERVER_TEST_ROOT,'schema'))
 ACTIVERECORD_TEST_ROOT    = File.expand_path(File.join(Gem.loaded_specs['activerecord'].full_gem_path,'test'))
+AREL_TEST_ROOT            = File.expand_path(File.join(Gem.loaded_specs['arel'].full_gem_path,'test'))
+
 ENV['ARCONFIG']           = File.expand_path(File.join(SQLSERVER_TEST_ROOT,'config.yml'))
 
 $:.unshift ACTIVERECORD_TEST_ROOT
+$LOAD_PATH.unshift AREL_TEST_ROOT
 
 require 'rubygems'
 require 'bundler'

test/cases/where_chain_test_sqlserver.rb

@@ -0,0 +1,17 @@
+require 'cases/sqlserver_helper'
+require 'models/post'
+require 'models/comment'
+
+module ActiveRecord
+  class WhereChainTest < ActiveRecord::TestCase
+    include SqlserverCoercedTest
+
+    COERCED_TESTS = [:test_not_eq_with_array_parameter]
+
+    def test_coerced_not_eq_with_array_parameter
+      expected = Arel::Nodes::Not.new("title = N'hello'")
+      relation = Post.where.not(['title = ?', 'hello'])
+      assert_equal([expected], relation.where_values)
+    end
+  end
+end