Stronger better default values. Views working too!

Author: metaskills

CHANGELOG.md

@@ -32,6 +32,7 @@
   * product_level
   * product_version
   * edition
+* Removed tests for old issue #164. Handled by core types now.
 
 #### Fixed
 

lib/active_record/connection_adapters/sqlserver/quoting.rb

@@ -19,7 +19,7 @@ def quote_default_value(value, column)
           if column.type == :uuid && value =~ /\(\)/
             value
           else
-            quote(value)
+            quote(value, column)
           end
         end
 

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -241,6 +241,7 @@ def column_definitions(table_name)
           results = do_exec_query(sql, 'SCHEMA', binds)
           results.map do |ci|
             ci = ci.symbolize_keys
+            ci[:_type] = ci[:type]
             ci[:type] = case ci[:type]
                         when /^bit|image|text|ntext|datetime$/
                           ci[:type]
@@ -255,22 +256,35 @@ def column_definitions(table_name)
                         else
                           ci[:type]
                         end
-            if ci[:default_value].nil? && schema_cache.view_exists?(table_name)
-              real_table_name = table_name_or_views_table_name(table_name)
-              real_column_name = views_real_column_name(table_name, ci[:name])
-              col_default_sql = "SELECT c.COLUMN_DEFAULT FROM #{database}INFORMATION_SCHEMA.COLUMNS c WHERE c.TABLE_NAME = '#{real_table_name}' AND c.COLUMN_NAME = '#{real_column_name}'"
-              ci[:default_value] = select_value col_default_sql, 'SCHEMA'
+            ci[:default_value],
+            ci[:default_function] = begin
+              default = ci[:default_value]
+              if default.nil? && schema_cache.view_exists?(table_name)
+                default = select_value "
+                  SELECT c.COLUMN_DEFAULT
+                  FROM #{database}INFORMATION_SCHEMA.COLUMNS c
+                  WHERE c.TABLE_NAME = '#{table_name_or_views_table_name(table_name)}'
+                  AND c.COLUMN_NAME = '#{views_real_column_name(table_name, ci[:name])}'".squish, 'SCHEMA'
+              end
+              case default
+              when nil
+                [nil, nil]
+              when /\A\((\w+\(\))\)\Z/
+                default_function = Regexp.last_match[1]
+                [nil, default_function]
+              when /\A\(N'(.*)'\)\Z/m
+                string_literal = SQLServer::Utils.unquote_string(Regexp.last_match[1])
+                [string_literal, nil]
+              else
+                type = case ci[:type]
+                       when /smallint|int|bigint/ then ci[:_type]
+                       else ci[:type]
+                       end
+                value = default.match(/\A\((.*)\)\Z/m)[1]
+                value = select_value "SELECT CAST(#{value} AS #{type}) AS value", 'SCHEMA'
+                [value, nil]
+              end
             end
-            ci[:default_value] = case ci[:default_value]
-                                 when nil, '(null)', '(NULL)'
-                                   nil
-                                 when /\A\((\w+\(\))\)\Z/
-                                   ci[:default_function] = Regexp.last_match[1]
-                                   nil
-                                 else
-                                   match_data = ci[:default_value].match(/\A\(+N?'?(.*?)'?\)+\Z/m)
-                                   match_data ? match_data[1].gsub("''", "'") : nil
-                                 end
             ci[:null] = ci[:is_nullable].to_i == 1
             ci.delete(:is_nullable)
             ci[:is_primary] = ci[:is_primary].to_i == 1

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -192,9 +192,14 @@ def initialize_type_map(m)
         m.register_type              %r{.*},            SQLServer::Type::UnicodeString.new
         # Exact Numerics
         register_class_with_limit m, 'bigint(8)',       SQLServer::Type::BigInteger
+        m.alias_type                 'bigint',          'bigint(8)'
         register_class_with_limit m, 'int(4)',          SQLServer::Type::Integer
+        m.alias_type                 'integer',         'int(4)'
+        m.alias_type                 'int',             'int(4)'
         register_class_with_limit m, 'smallint(2)',     SQLServer::Type::SmallInteger
+        m.alias_type                 'smallint',        'smallint(2)'
         register_class_with_limit m, 'tinyint(1)',      SQLServer::Type::TinyInteger
+        m.alias_type                 'tinyint',         'tinyint(1)'
         m.register_type              'bit',             SQLServer::Type::Boolean.new
         m.register_type              %r{\Adecimal}i do |sql_type|
           scale = extract_scale(sql_type)

test/cases/adapter_test_sqlserver.rb

@@ -204,10 +204,6 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       assert_equal '[foo].[bar].[baz]', connection.quote_column_name('foo.bar.baz')
     end
 
-    it "return 0 for empty string" do
-      assert_equal '0', connection.quote('', Post.columns_hash['id'])
-    end
-
     it "surround string with national prefix" do
       assert_equal "N'foo'", connection.quote("foo")
     end