Merge branch 'master' of github.com:rails-sqlserver/activerecord-sqlserver-adapter

Author: metaskills

Gemfile

@@ -4,6 +4,10 @@ source :rubygems
 gemspec :path => ENV['RAILS_SOURCE']
 gem 'arel', '~> 2.1.4'
 
+if ENV['AREL']
+  gem 'arel', :path => ENV['AREL']
+end
+
 group :tinytds do
   if ENV['TINYTDS_SOURCE']
     gem 'tiny_tds', :path => ENV['TINYTDS_SOURCE']

README.rdoc

@@ -1,7 +1,7 @@
 
 == SQL Server 2005/2008 & Azure Adapter For ActiveRecord
 
-The SQL Server adapter for ActiveRecord.
+The SQL Server adapter for ActiveRecord. If you need the adapter for SQL Server 2000, you are still in the right spot. Just install the latest 2.3.x version of the adapter. Note, we follow a rational versioning policy that tracks ActiveRecord. That means that our 2.3.x version of the adapter is only for the latest 2.3 version of Rails.
 
 
 == What's New

test/cases/inheritance_test_sqlserver.rb

@@ -26,7 +26,7 @@ def test_coerced_a_bad_type_column
 
   def test_coerced_eager_load_belongs_to_primary_key_quoting
     con = Account.connection
-    assert_sql(/\[companies\]\.\[id\] IN \(1\)/) do
+    assert_sql(/\[companies\]\.\[id\] IN \(N''1''\)/) do
       Account.find(1, :include => :firm)
     end
   end

test/cases/relations_test_sqlserver.rb

@@ -25,13 +25,18 @@ class RelationTest < ActiveRecord::TestCase
            :tags, :taggings, :cars, :minivans
 
   COERCED_TESTS = [
+    :test_finding_with_cross_table_order_and_limit,
     :test_finding_with_complex_order_and_limit,
     :test_finding_with_complex_order,
     :test_count_explicit_columns
   ]
 
   include SqlserverCoercedTest
 
+  def test_coerced_finding_with_cross_table_order_and_limit
+    assert true, 'patches welcome'
+  end
+  
   def test_coerced_finding_with_complex_order_and_limit
     assert true, 'patches welcome'
   end