Merge pull request #16 from localytics/in-time-zone

Cast Time/Timestamp to Rails application timezone.

lib/active_record/connection_adapters/odbc_adapter.rb

@@ -12,7 +12,6 @@
 require 'odbc_adapter/column_metadata'
 require 'odbc_adapter/database_metadata'
 require 'odbc_adapter/registry'
-require 'odbc_adapter/type_caster'
 require 'odbc_adapter/version'
 
 module ActiveRecord
@@ -79,6 +78,7 @@ class ODBCAdapter < AbstractAdapter
       attr_reader :database_metadata
 
       def initialize(connection, logger, config, database_metadata)
+        configure_time_options(connection)
         super(connection, logger, config)
         @database_metadata = database_metadata
       end
@@ -113,6 +113,7 @@ def reconnect!
           else
             ODBC::Database.new.drvconnect(@config[:driver])
           end
+        configure_time_options(@connection)
         super
       end
       alias reset! reconnect!
@@ -189,6 +190,11 @@ def alias_type(map, new_type, old_type)
           map.lookup(old_type, *args)
         end
       end
+
+      # Ensure ODBC is mapping time-based fields to native ruby objects
+      def configure_time_options(connection)
+        connection.use_time = true
+      end
     end
   end
 end

lib/odbc_adapter/database_statements.rb

@@ -33,13 +33,6 @@ def exec_query(sql, name = 'SQL', binds = [], prepare: false) # rubocop:disable
         values  = stmt.to_a
         stmt.drop
 
-        casters = TypeCaster.build_from(columns.values)
-        if casters.any?
-          values.each do |row|
-            casters.each { |caster| row[caster.idx] = caster.cast(row[caster.idx]) }
-          end
-        end
-
         values = dbms_type_cast(columns.values, values)
         column_names = columns.keys.map { |key| format_case(key) }
         ActiveRecord::Result.new(column_names, values)

lib/odbc_adapter/version.rb

@@ -1,3 +1,3 @@
 module ODBCAdapter
-  VERSION = '5.0.3'.freeze
+  VERSION = '5.0.4'.freeze
 end