Corrections to SQLServer native data types. Closes #2267.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2545 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 12 insertions, 10 deletions

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 959a1069fd..d38390110f 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Corrections to SQLServer native data types. #2267.  [rails.20.clarry@spamgourmet.com]
+
 * Deprecated ActiveRecord::Base.threaded_connection in favor of ActiveRecord::Base.allow_concurrency.
 
 * Protect id attribute from mass assigment even when the primary key is set to something else. #2438. [Blair Zajac <blair@orcaware.com>]
diff --git a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
index 253c8f4e88..52728cd432 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -165,16 +165,16 @@ module ActiveRecord
       def native_database_types
         {
           :primary_key => "int NOT NULL IDENTITY(1, 1) PRIMARY KEY",
-          :string      => { :name => "varchar(255)" },
-          :text        => { :name => "text(16)" },
-          :integer     => { :name => "int(4)", :limit => 11 },
-          :float       => { :name => "float(8)" },
-          :datetime    => { :name => "datetime(8)" },
-          :timestamp   => { :name => "datetime(8)" },
-          :time        => { :name => "datetime(8)" },
-          :date        => { :name => "datetime(8)" },
-          :binary      => { :name => "image(16)" },
-          :boolean     => { :name => "bit(1)" }
+          :string      => { :name => "varchar", :limit => 255  },
+          :text        => { :name => "text" },
+          :integer     => { :name => "int"},
+          :float       => { :name => "float", :limit => 8 },
+          :datetime    => { :name => "datetime" },
+          :timestamp   => { :name => "datetime" },
+          :time        => { :name => "datetime" },
+          :date        => { :name => "datetime" },
+          :binary      => { :name => "image"},
+          :boolean     => { :name => "bit"}
         }
       end