[Rails3] Move all core extensions to active_record/connection_adapters/sqlserver/core_ext.

Author: metaskills

RAILS3_NOTES

@@ -54,7 +54,6 @@ on a local branch of our remote tracking branch.
     Undefined coerced test: MigrationTest#test_add_column_not_null_without_default
     Undefined coerced test: ChangeTableMigrationsTest#test_string_creates_string_column
     Undefined coerced test: QueryCacheTest#test_cache_does_not_wrap_string_results_in_arrays
-  * Move all sqlserver_adapter/core_ext files to sqlserver/core_ext.
   * Make sure the repair special columns was good to go.
   * Possibly remove 2000 support and query methods.
   * Make sure Gemspec is good.

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

@@ -0,0 +1,57 @@
+require 'active_record/version'
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Sqlserver
+      module CoreExt
+        module ActiveRecord
+
+          def self.included(klass)
+            klass.extend ClassMethods
+            class << klass
+              alias_method_chain :reset_column_information, :sqlserver_cache_support
+            end
+          end
+
+          module ClassMethods
+
+            def execute_procedure(proc_name, *variables)
+              if connection.respond_to?(:execute_procedure)
+                connection.execute_procedure(proc_name,*variables)
+              else
+                []
+              end
+            end
+
+            def coerce_sqlserver_date(*attributes)
+              write_inheritable_attribute :coerced_sqlserver_date_columns, Set.new(attributes.map(&:to_s))
+            end
+
+            def coerce_sqlserver_time(*attributes)
+              write_inheritable_attribute :coerced_sqlserver_time_columns, Set.new(attributes.map(&:to_s))
+            end
+
+            def coerced_sqlserver_date_columns
+              read_inheritable_attribute(:coerced_sqlserver_date_columns) || []
+            end
+
+            def coerced_sqlserver_time_columns
+              read_inheritable_attribute(:coerced_sqlserver_time_columns) || []
+            end
+
+            def reset_column_information_with_sqlserver_cache_support
+              connection.send(:initialize_sqlserver_caches) if connection.respond_to?(:sqlserver?)
+              reset_column_information_without_sqlserver_cache_support
+            end
+
+          end
+
+        end
+      end
+    end
+  end
+end
+
+
+ActiveRecord::Base.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::ActiveRecord
+

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

@@ -0,0 +1,42 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Sqlserver
+      module CoreExt
+        module ODBC
+
+          module TimeStamp
+            def to_sqlserver_string
+              date, time, nanoseconds = to_s.split(' ')
+              "#{date} #{time}.#{sprintf("%03d",nanoseconds.to_i/1000000)}"
+            end
+          end
+
+          module Statement
+            def finished?
+              begin
+                connected?
+                false
+              rescue ::ODBC::Error => e
+                true
+              end
+            end
+          end
+
+          module Database
+            def run_block(*args)
+              yield sth = run(*args)
+              sth.drop
+            end
+          end
+
+        end
+      end
+    end
+  end
+end
+
+
+ODBC::TimeStamp.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::ODBC::TimeStamp if defined?(ODBC::TimeStamp)
+ODBC::Statement.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::ODBC::Statement if defined?(ODBC::Statement)
+ODBC::Database.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::ODBC::Database if defined?(ODBC::Database)
+

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -1,6 +1,6 @@
 require 'active_record'
 require 'active_record/connection_adapters/abstract_adapter'
-require 'active_record/connection_adapters/sqlserver_adapter/core_ext/active_record'
+require 'active_record/connection_adapters/sqlserver/core_ext/active_record'
 require 'active_record/connection_adapters/sqlserver/database_limits'
 require 'active_record/connection_adapters/sqlserver/database_statements'
 require 'active_record/connection_adapters/sqlserver/schema_statements'
@@ -20,7 +20,7 @@ def self.sqlserver_connection(config) #:nodoc:
       case mode
       when :odbc
         require_library_or_gem 'odbc' unless defined?(ODBC)
-        require 'active_record/connection_adapters/sqlserver_adapter/core_ext/odbc'
+        require 'active_record/connection_adapters/sqlserver/core_ext/odbc'
         raise ArgumentError, 'Missing :dsn configuration.' unless config.has_key?(:dsn)
       when :adonet
         require 'System.Data'