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

Author: metaskills

RUNNING_UNIT_TESTS

@@ -21,21 +21,17 @@ Clone adapter git://github.com/rails-sqlserver/activerecord-sqlserver-adapter.gi
 The master branch is the one under development for rails 3, track the repos 2-3-stable 
 branch for 2.x development.
 
-The tests of this adapter depend on the existence of the rails and/or arel source 
-which can be cloned at git://github.com/rails/rails.git and git://github.com/rails/arel.git
+The tests of this adapter depend on the existence of the rails which can be cloned at 
+git://github.com/rails/rails.git
 
-Once you have cloned these repos set the RAILS_SOURCE and AREL environment variables
-to their full path. For instance:
+Once you have cloned these repos set the RAILS_SOURCE environment variable to its 
+full path. For instance:
 
   ∴ echo $RAILS_SOURCE
   /Users/kencollins/Repositories/rails
 
-  ∴ echo $AREL
-  /Users/kencollins/Repositories/arel
-
 Do not forget to checkout the version tags of each repo that match either our gemspec 
-or what version your tests target. For instance, v3.0.3 tag for ActiveRecord and 
-v2.0.7 for ARel. 
+or what version your tests target. For instance, v3.0.3 tag for Rails/ActiveRecord.
 
 
 = Setup Connection Mode

activerecord-sqlserver-adapter.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.name          = "activerecord-sqlserver-adapter"
-  s.version       = "3.1.0"
+  s.version       = "3.1.0.rc2"
   s.summary       = "SQL Server 2005 and 2008 Adapter For ActiveRecord."
   s.description   = "SQL Server 2005 and 2008 Adapter For ActiveRecord"
 
@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.rdoc_options.concat ['--main',  'README.rdoc']
   s.rubyforge_project = 'activerecord-sqlserver-adapter'
 
-  s.add_dependency('activerecord', '~> 3.1.0')
+  s.add_dependency('activerecord', '~> 3.1.0.rc1')
 end
 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -159,7 +159,7 @@ class SQLServerAdapter < AbstractAdapter
       include Sqlserver::Errors
 
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.1.0'.freeze
+      VERSION                     = '3.1.0.rc2'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011].freeze