New ActiveRecord::Type objects for SQLServer.

Author: metaskills

README.md

@@ -18,20 +18,6 @@ This is a long story, but if you are not working with a legacy database and you
 http://wiki.github.com/rails-sqlserver/activerecord-sqlserver-adapter/rails-db-rake-tasks
 
 
-#### Date/Time Data Type Hinting
-
-SQL Server 2005 does not include a native data type for just `date` or `time`, it only has `datetime`. To pass the ActiveRecord tests we implemented two simple class methods that can teach your models to coerce column information to be cast correctly. Simply pass a list of symbols to either the `coerce_sqlserver_date` or `coerce_sqlserver_time` methods that correspond to 'datetime' columns that need to be cast correctly.
-
-```ruby
-class Topic < ActiveRecord::Base
-  coerce_sqlserver_date :last_read
-  coerce_sqlserver_time :bonus_time
-end
-```
-
-This implementation has some limitations. To date we can only coerce date/time types for models that conform to the expected ActiveRecord class to table naming conventions. So a table of 'foo_bar_widgets' will look for coerced column types in the FooBarWidget class.
-
-
 #### Executing Stored Procedures
 
 Every class that sub classes ActiveRecord::Base will now have an execute_procedure class method to use. This method takes the name of the stored procedure which can be a string or symbol and any number of variables to pass to the procedure. Arguments will automatically be quoted per the connection's standards as normal. For example:

lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb

@@ -3,15 +3,11 @@ module ConnectionAdapters
     module SQLServer
       module CoreExt
         module ActiveRecord
-          extend ActiveSupport::Concern
 
-          included do
-            class_attribute :coerced_sqlserver_date_columns, :coerced_sqlserver_time_columns
-            self.coerced_sqlserver_date_columns = Set.new
-            self.coerced_sqlserver_time_columns = Set.new
-          end
+          extend ActiveSupport::Concern
 
           module ClassMethods
+
             def execute_procedure(proc_name, *variables)
               if connection.respond_to?(:execute_procedure)
                 connection.execute_procedure(proc_name, *variables)
@@ -20,14 +16,8 @@ def execute_procedure(proc_name, *variables)
               end
             end
 
-            def coerce_sqlserver_date(*attributes)
-              self.coerced_sqlserver_date_columns += attributes.map(&:to_s)
-            end
-
-            def coerce_sqlserver_time(*attributes)
-              self.coerced_sqlserver_time_columns += attributes.map(&:to_s)
-            end
           end
+
         end
       end
     end

lib/active_record/connection_adapters/sqlserver/quoting.rb

@@ -44,30 +44,10 @@ def unquoted_false
           0
         end
 
-        def quoted_datetime(value)
-          if value.acts_like?(:time)
-            time_zone_qualified_value = quoted_value_acts_like_time_filter(value)
-            if value.is_a?(Date)
-              time_zone_qualified_value.iso8601(3).to(18)
-            else
-              time_zone_qualified_value.iso8601(3).to(22)
-            end
-          else
-            quoted_date(value)
-          end
-        end
-
-        def quoted_full_iso8601(value)
-          if value.acts_like?(:time)
-            value.is_a?(Date) ? quoted_value_acts_like_time_filter(value).to_time.xmlschema.to(18) : quoted_value_acts_like_time_filter(value).iso8601(7).to(22)
-          else
-            quoted_date(value)
-          end
-        end
-
         def quoted_date(value)
           if value.acts_like?(:time) && value.respond_to?(:usec)
-            "#{super}.#{sprintf('%03d', value.usec / 1000)}"
+            precision = (BigDecimal(value.usec.to_s) / 1_000_000).round(3).to_s.split('.').last
+            "#{super}.#{precision}"
           elsif value.acts_like?(:date)
             value.to_s(:_sqlserver_dateformat)
           else
@@ -78,16 +58,20 @@ def quoted_date(value)
 
         private
 
-        def _quote(value) # , column = nil
+        def _quote(value)
           case value
+          when Type::Binary::Data
+            "0x#{value.hex}"
+          when SQLServer::Type::Quoter
+            value.quote_ss_value
           when String, ActiveSupport::Multibyte::Chars
             if value.is_utf8?
               "#{QUOTED_STRING_PREFIX}#{super}"
             else
               super
             end
           else
-            super(value)
+            super
           end
         end
 

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -45,7 +45,7 @@ def indexes(table_name, name = nil)
         def columns(table_name, _name = nil)
           return [] if table_name.blank?
           column_definitions(table_name).map do |ci|
-            sqlserver_options = ci.except(:name, :default_value, :type, :null).merge(database_year: database_year)
+            sqlserver_options = ci.slice :ordinal_position, :is_primary, :is_identity, :default_function
             cast_type = lookup_cast_type(ci[:type])
             new_column ci[:name], ci[:default_value], cast_type, ci[:type], ci[:null], sqlserver_options
           end
@@ -199,6 +199,7 @@ def column_definitions(table_name)
             columns.COLUMN_DEFAULT AS default_value,
             columns.NUMERIC_SCALE AS numeric_scale,
             columns.NUMERIC_PRECISION AS numeric_precision,
+            columns.DATETIME_PRECISION AS datetime_precision,
             columns.ordinal_position,
             CASE
               WHEN columns.DATA_TYPE IN ('nchar','nvarchar') THEN columns.CHARACTER_MAXIMUM_LENGTH
@@ -245,11 +246,13 @@ def column_definitions(table_name)
             ci[:type] = case ci[:type]
                         when /^bit|image|text|ntext|datetime$/
                           ci[:type]
+                        when /^time$/i
+                          "#{ci[:type]}(#{ci[:datetime_precision]})"
                         when /^numeric|decimal$/i
                           "#{ci[:type]}(#{ci[:numeric_precision]},#{ci[:numeric_scale]})"
                         when /^float|real$/i
                           "#{ci[:type]}(#{ci[:numeric_precision]})"
-                        when /^char|nchar|varchar|nvarchar|varbinary|bigint|int|smallint$/
+                        when /^char|nchar|varchar|nvarchar|binary|varbinary|bigint|int|smallint$/
                           ci[:length].to_i == -1 ? "#{ci[:type]}(max)" : "#{ci[:type]}(#{ci[:length]})"
                         else
                           ci[:type]

lib/active_record/connection_adapters/sqlserver/type.rb

@@ -0,0 +1,36 @@
+require 'active_record/type'
+require 'active_record/connection_adapters/sqlserver/type/core_ext/value.rb'
+require 'active_record/connection_adapters/sqlserver/type/castable.rb'
+require 'active_record/connection_adapters/sqlserver/type/quoter.rb'
+# Exact Numerics
+require 'active_record/connection_adapters/sqlserver/type/integer.rb'
+require 'active_record/connection_adapters/sqlserver/type/big_integer.rb'
+require 'active_record/connection_adapters/sqlserver/type/small_integer.rb'
+require 'active_record/connection_adapters/sqlserver/type/tiny_integer.rb'
+require 'active_record/connection_adapters/sqlserver/type/boolean.rb'
+require 'active_record/connection_adapters/sqlserver/type/decimal.rb'
+require 'active_record/connection_adapters/sqlserver/type/money.rb'
+require 'active_record/connection_adapters/sqlserver/type/small_money.rb'
+# Approximate Numerics
+require 'active_record/connection_adapters/sqlserver/type/float.rb'
+# Date and Time
+require 'active_record/connection_adapters/sqlserver/type/date.rb'
+require 'active_record/connection_adapters/sqlserver/type/datetime.rb'
+require 'active_record/connection_adapters/sqlserver/type/smalldatetime.rb'
+require 'active_record/connection_adapters/sqlserver/type/time.rb'
+# Character Strings
+require 'active_record/connection_adapters/sqlserver/type/string.rb'
+require 'active_record/connection_adapters/sqlserver/type/char.rb'
+require 'active_record/connection_adapters/sqlserver/type/varchar.rb'
+require 'active_record/connection_adapters/sqlserver/type/varchar_max.rb'
+require 'active_record/connection_adapters/sqlserver/type/text.rb'
+# Unicode Character Strings
+require 'active_record/connection_adapters/sqlserver/type/unicode_string.rb'
+require 'active_record/connection_adapters/sqlserver/type/unicode_char.rb'
+require 'active_record/connection_adapters/sqlserver/type/unicode_varchar.rb'
+require 'active_record/connection_adapters/sqlserver/type/unicode_varchar_max.rb'
+require 'active_record/connection_adapters/sqlserver/type/unicode_text.rb'
+# Binary Strings
+require 'active_record/connection_adapters/sqlserver/type/binary.rb'
+require 'active_record/connection_adapters/sqlserver/type/varbinary.rb'
+require 'active_record/connection_adapters/sqlserver/type/varbinary_max.rb'

lib/active_record/connection_adapters/sqlserver/type/big_integer.rb

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module Type
+        class BigInteger < Integer
+
+
+
+        end
+      end
+    end
+  end
+end

lib/active_record/connection_adapters/sqlserver/type/binary.rb

@@ -0,0 +1,12 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module Type
+        class Binary < ActiveRecord::Type::Binary
+
+
+        end
+      end
+    end
+  end
+end

lib/active_record/connection_adapters/sqlserver/type/boolean.rb

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module Type
+        class Boolean < ActiveRecord::Type::Boolean
+
+          include Castable
+
+        end
+      end
+    end
+  end
+end

lib/active_record/connection_adapters/sqlserver/type/castable.rb

@@ -0,0 +1,15 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module Type
+        module Castable
+
+          def type_cast_from_database(value)
+            type_cast_from_ss_database? ? super : value
+          end
+
+        end
+      end
+    end
+  end
+end

lib/active_record/connection_adapters/sqlserver/type/char.rb

@@ -0,0 +1,12 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLServer
+      module Type
+        class Char < String
+
+
+        end
+      end
+    end
+  end
+end