Make Fetch Happen!

Used the `base_test_sqlserver.rb` to get basic query support working.

* Teardown our Arel visitor!!! Fetch now happens. Will build up form here.
* Teardown quoting.rb to basics. Will build from here.
* Use abstract adapter `lookup_cast_type` and pass `cast_type` when building column objects now.
* TODO: I will be building out new Type objects that allow TinyTDS to win at native casting.
* Simplify our column object. Remove 2008 hacks and need for so much out of scope reflection.

Author: metaskills

lib/active_record/connection_adapters/sqlserver/quoting.rb

@@ -2,41 +2,10 @@ module ActiveRecord
   module ConnectionAdapters
     module Sqlserver
       module Quoting
-        QUOTED_TRUE, QUOTED_FALSE = '1', '0'
-        QUOTED_STRING_PREFIX = 'N'
-
-        def quote(value, column = nil)
-          case value
-          when String, ActiveSupport::Multibyte::Chars
-            if column && column.type == :integer && value.blank?
-              value.to_i.to_s
-            elsif column && column.type == :binary
-              column.class.string_to_binary(value)
-            elsif column && [:uuid, :uniqueidentifier].include?(column.type)
-              "'#{quote_string(value)}'"
-            elsif value.is_utf8? || (column && column.type == :string)
-              "#{quoted_string_prefix}'#{quote_string(value)}'"
-            else
-              super
-            end
-          when Date, Time
-            if column && column.sql_type == 'datetime'
-              "'#{quoted_datetime(value)}'"
-            elsif column && (column.sql_type == 'datetimeoffset' || column.sql_type == 'time')
-              "'#{quoted_full_iso8601(value)}'"
-            else
-              super
-            end
-          when nil
-            column.respond_to?(:sql_type) && column.sql_type == 'timestamp' ? 'DEFAULT' : super
-          else
-            super
-          end
-        end
 
-        def quoted_string_prefix
-          QUOTED_STRING_PREFIX
-        end
+        QUOTED_TRUE  = '1'
+        QUOTED_FALSE = '0'
+        QUOTED_STRING_PREFIX = 'N'
 
         def quote_string(s)
           Sqlserver::Utils.quote_string(s)
@@ -46,11 +15,6 @@ def quote_column_name(name)
           Sqlserver::Utils.extract_identifiers(name).object_quoted
         end
 
-        def quote_table_name(name)
-          quote_column_name(name)
-        end
-
-        # Does not quote function default values for UUID columns
         def quote_default_value(value, column)
           if column.type == :uuid && value =~ /\(\)/
             value
@@ -59,22 +23,27 @@ def quote_default_value(value, column)
           end
         end
 
-        def substitute_at(column, index)
-          if column.respond_to?(:sql_type) && column.sql_type == 'timestamp'
-            nil
-          else
-            Arel::Nodes::BindParam.new "@#{index}"
-          end
+        def substitute_at(column, _unused = 0)
+          return nil if column.respond_to?(:sql_type) && column.sql_type == 'timestamp'
+          super
         end
 
         def quoted_true
           QUOTED_TRUE
         end
 
+        def unquoted_true
+          1
+        end
+
         def quoted_false
           QUOTED_FALSE
         end
 
+        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)
@@ -106,12 +75,27 @@ def quoted_date(value)
           end
         end
 
-        protected
+
+        private
+
+        def _quote(value) # , column = nil
+          case value
+          when String, ActiveSupport::Multibyte::Chars
+            if value.is_utf8?
+              "#{QUOTED_STRING_PREFIX}#{super}"
+            else
+              super
+            end
+          else
+            super(value)
+          end
+        end
 
         def quoted_value_acts_like_time_filter(value)
           zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
           value.respond_to?(zone_conversion_method) ? value.send(zone_conversion_method) : value
         end
+
       end
     end
   end

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -2,6 +2,7 @@ module ActiveRecord
   module ConnectionAdapters
     module Sqlserver
       module SchemaStatements
+
         def native_database_types
           @native_database_types ||= initialize_native_database_types.freeze
         end
@@ -45,10 +46,15 @@ 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)
-            SQLServerColumn.new ci[:name], ci[:default_value], ci[:type], ci[:null], sqlserver_options
+            cast_type = lookup_cast_type(ci[:type])
+            new_column ci[:name], ci[:default_value], cast_type, ci[:type], ci[:null], sqlserver_options
           end
         end
 
+        def new_column(name, default, cast_type, sql_type = nil, null = true, sqlserver_options={})
+          SQLServerColumn.new name, default, cast_type, sql_type, null, sqlserver_options
+        end
+
         # like postgres, sqlserver requires the ORDER BY columns in the select list for distinct queries, and
         # requires that the ORDER BY include the distinct column. Unfortunately, sqlserver does not support
         # DISTINCT ON () like Posgres, or FIRST_VALUE() like Oracle (at least before SQL Server 2012). Because
@@ -417,6 +423,7 @@ def identity_column(table_name)
         def create_table_definition(name, temporary, options, as = nil)
           TableDefinition.new native_database_types, name, temporary, options, as
         end
+
       end
     end
   end

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -1,6 +1,6 @@
 require 'base64'
 require 'active_record'
-require 'arel/arel_sqlserver'
+require 'arel_sqlserver'
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/sqlserver/core_ext/active_record'
 require 'active_record/connection_adapters/sqlserver/core_ext/explain'
@@ -42,10 +42,6 @@ class SQLServerAdapter < AbstractAdapter
 
       self.enable_default_unicode_types = true
 
-      class BindSubstitution < Arel::Visitors::SQLServer # :nodoc:
-        include Arel::Visitors::BindVisitor
-      end
-
       def initialize(connection, logger, pool, config)
         super(connection, logger, pool)
         # AbstractAdapter Responsibility

lib/active_record/connection_adapters/sqlserver_column.rb

@@ -1,9 +1,10 @@
 module ActiveRecord
   module ConnectionAdapters
     class SQLServerColumn < Column
-      def initialize(name, default, sql_type = nil, null = true, sqlserver_options = {})
+
+      def initialize(name, default, cast_type, sql_type = nil, null = true, sqlserver_options = {})
         @sqlserver_options = sqlserver_options.symbolize_keys
-        super(name, default, sql_type, null)
+        super(name, default, cast_type, sql_type, null)
         @primary = @sqlserver_options[:is_identity] || @sqlserver_options[:is_primary]
       end
 
@@ -52,22 +53,6 @@ def default_function
         @sqlserver_options[:default_function]
       end
 
-      def table_name
-        @sqlserver_options[:table_name]
-      end
-
-      def table_klass
-        @table_klass ||= begin
-          table_name.classify.constantize
-        rescue StandardError, NameError, LoadError
-          nil
-        end
-        (@table_klass && @table_klass < ActiveRecord::Base) ? @table_klass : nil
-      end
-
-      def database_year
-        @sqlserver_options[:database_year]
-      end
 
       private
 
@@ -93,24 +78,13 @@ def simplified_type(field_type)
         when /image/i             then :binary
         when /bit/i               then :boolean
         when /uniqueidentifier/i  then :uuid
-        when /datetime/i          then simplified_datetime
+        when /datetime/i          then :datetime
         when /varchar\(max\)/     then :text
         when /timestamp/          then :binary
         else super
         end
       end
 
-      def simplified_datetime
-        if database_year >= 2008
-          :datetime
-        elsif table_klass && table_klass.coerced_sqlserver_date_columns.include?(name)
-          :date
-        elsif table_klass && table_klass.coerced_sqlserver_time_columns.include?(name)
-          :time
-        else
-          :datetime
-        end
-      end
-    end # class SQLServerColumn
-  end # module ConnectionAdapters
-end # module ActiveRecord
+    end
+  end
+end