SQLServer: recognize real column type as Ruby float, correctly schema-dump tables with no indexes or descending indexes. References #7057, #7703. Closes #7333.

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

2 files changed, 22 insertions, 1 deletions

diff --git a/activerecord/test/adapter_test_sqlserver.rb b/activerecord/test/adapter_test_sqlserver.rb
index bf74671209..548668d5e7 100644
--- a/activerecord/test/adapter_test_sqlserver.rb
+++ b/activerecord/test/adapter_test_sqlserver.rb
@@ -4,6 +4,8 @@ require 'fixtures/post'
 require 'fixtures/task'

 

 class SqlServerAdapterTest < Test::Unit::TestCase

+  class TableWithRealColumn < ActiveRecord::Base; end

+

   fixtures :posts, :tasks

 

   def setup

@@ -11,7 +13,11 @@ class SqlServerAdapterTest < Test::Unit::TestCase
   end

 

   def teardown

-    @connection.execute("SET LANGUAGE us_english")

+    @connection.execute("SET LANGUAGE us_english") rescue nil

+  end

+

+  def test_real_column_has_float_type

+    assert_equal :float, TableWithRealColumn.columns_hash["real_number"].type

   end

 

   # SQL Server 2000 has a bug where some unambiguous date formats are not 

@@ -24,6 +30,14 @@ class SqlServerAdapterTest < Test::Unit::TestCase
     end

   end

 

+  def test_indexes_with_descending_order

+    # Make sure we have an index with descending order

+    @connection.execute "CREATE INDEX idx_credit_limit ON accounts (credit_limit DESC)" rescue nil

+    assert_equal ["credit_limit"], @connection.indexes('accounts').first.columns

+  ensure

+    @connection.execute "DROP INDEX accounts.idx_credit_limit"

+  end

+

   def test_execute_without_block_closes_statement

     assert_all_statements_used_are_closed do

       @connection.execute("SELECT 1")

diff --git a/activerecord/test/fixtures/db_definitions/schema.rb b/activerecord/test/fixtures/db_definitions/schema.rb
index b5d7704d2e..3dc9a9b8a3 100644
--- a/activerecord/test/fixtures/db_definitions/schema.rb
+++ b/activerecord/test/fixtures/db_definitions/schema.rb
@@ -64,4 +64,11 @@ ActiveRecord::Schema.define do
       t.column :name, :string
     end
   end
+  
+  # For sqlserver 2000+, ensure real columns can be used
+  if adapter_name.starts_with?("SQLServer")
+    create_table :table_with_real_columns, :force => true do |t|
+      t.column :real_number, :real
+    end
+  end
 end