Fix rake task to work with 0.9. Schema reflection changes for better schema support.

Author: metaskills

Rakefile

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
 
 # Notes for cross compile:
 # $ gcla ; bundle install ; rake compile ; rake cross compile ; rake cross native gem
@@ -17,7 +16,7 @@ def test_files
   unless ENV['ACTIVERECORD_UNITTEST_SKIP']
     ar_cases = Dir.glob("#{ENV['RAILS_SOURCE']}/activerecord/test/cases/**/*_test.rb")
     adapter_cases = Dir.glob("#{ENV['RAILS_SOURCE']}/activerecord/test/cases/adapters/**/*_test.rb")
-    files << (ar_cases-adapter_cases).sort
+    files += (ar_cases-adapter_cases).sort
   end
   files
 end

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -237,7 +237,7 @@ def do_exec_query(sql, name, binds)
             next if ar_column && column.sql_type == 'timestamp'
             v = value
             names_and_types << if ar_column
-                                 v = value.to_i if column.is_integer?
+                                 v = value.to_i if column.is_integer? && value.present?
                                  "@#{index} #{column.sql_type_for_statement}"
                                elsif column.acts_like?(:string)
                                  "@#{index} nvarchar(max)"

lib/active_record/connection_adapters/sqlserver/quoting.rb

@@ -8,7 +8,9 @@ module Quoting
         def quote(value, column = nil)
           case value
           when String, ActiveSupport::Multibyte::Chars
-            if column && column.type == :binary
+            if column && column.type == :integer && value.blank?
+              nil
+            elsif column && column.type == :binary
               column.class.string_to_binary(value)
             elsif value.is_utf8? || (column && column.type == :string)
               "N'#{quote_string(value)}'"

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -7,25 +7,20 @@ def native_database_types
           @native_database_types ||= initialize_native_database_types.freeze
         end
 
-        def tables(name = nil, schema = nil)
+        def tables(name = nil, table_type = 'BASE TABLE')
           info_schema_query do
-            select_values "SELECT #{lowercase_schema_reflection_sql('TABLE_NAME')} FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties' AND TABLE_SCHEMA = #{schema.blank? ? "schema_name()" : "#{quote(schema)}"}"
+            select_values "SELECT #{lowercase_schema_reflection_sql('TABLE_NAME')} FROM INFORMATION_SCHEMA.TABLES #{"WHERE TABLE_TYPE = '#{table_type}'" if table_type} ORDER BY TABLE_NAME"
           end
         end
-        
-        def tables_in_schema(table_schema)
-          table_schema.blank? ? [] : tables(nil,table_schema)
-        end
 
         def table_exists?(table_name)
-          table_schema = unqualify_table_schema(table_name)
           unquoted_table_name = unqualify_table_name(table_name)
-          super || tables.include?(unquoted_table_name) || views.include?(unquoted_table_name) || tables_in_schema(table_schema).include?(unquoted_table_name)
+          super || tables.include?(unquoted_table_name) || views.include?(unquoted_table_name)
         end
 
         def indexes(table_name, name = nil)
-          unquoted_table_name = unqualify_table_name(table_name)
-          select("EXEC sp_helpindex #{quote_table_name(unquoted_table_name)}",name).inject([]) do |indexes,index|
+          data = select("EXEC sp_helpindex #{quote(table_name)}",name) rescue []
+          data.inject([]) do |indexes,index|
             index = index.with_indifferent_access
             if index[:index_description] =~ /primary key/
               indexes
@@ -141,8 +136,7 @@ def change_column_null(table_name, column_name, null, default = nil)
         # === SQLServer Specific ======================================== #
 
         def views(name = nil)
-          @sqlserver_views_cache ||= 
-            info_schema_query { select_values("SELECT #{lowercase_schema_reflection_sql('TABLE_NAME')} FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME NOT IN ('sysconstraints','syssegments')") }
+          @sqlserver_views_cache ||= tables(name,'VIEW')
         end
 
 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -72,11 +72,11 @@ def is_identity?
       end
 
       def is_utf8?
-        @sql_type =~ /nvarchar|ntext|nchar/i
+        !!(@sql_type =~ /nvarchar|ntext|nchar/i)
       end
 
       def is_integer?
-        @sql_type =~ /int/i
+        !!(@sql_type =~ /int/i)
       end
 
       def sql_type_for_statement

test/cases/schema_test_sqlserver.rb

@@ -22,7 +22,6 @@ def read_schema_name(table_name)
   context 'When table is in non-dbo schema' do
 
     should 'work with #table_exists?' do
-      assert @connection.tables_in_schema('test').include?('sql_server_schema_natural_id')
       assert @connection.table_exists?('test.sql_server_schema_natural_id')
     end