Ensure that execute_procedure returns proper time zones. Fixes #449

Author: metaskills

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Conform to new data_sources interfaces. See: https://git.io/va4Fp
 * The `primary_key` method falls back to Identity columns. Not the other way around. Fixes #454. Thanks @marceloeloelo
+* Ensure that `execute_procedure` returns proper time zones. Fixes #449
 
 #### Changed
 

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -117,7 +117,8 @@ def execute_procedure(proc_name, *variables)
             case @connection_options[:mode]
             when :dblib
               result = @connection.execute(sql)
-              result.each(as: :hash, cache_rows: true) do |row|
+              options = { as: :hash, cache_rows: true, timezone: ActiveRecord::Base.default_timezone || :utc }
+              result.each(options) do |row|
                 r = row.with_indifferent_access
                 yield(r) if block_given?
               end

test/cases/execute_procedure_test_sqlserver.rb

@@ -35,4 +35,10 @@ class ExecuteProcedureTestSQLServer < ActiveRecord::TestCase
     assert_equal 'VIEW', table_info['TABLE_TYPE'], "Table Info: #{table_info.inspect}"
   end
 
+  it 'uses the proper timezone' do
+    date_proc = connection.execute_procedure('my_getutcdate').first['utcdate']
+    date_base = connection.select_value('select GETUTCDATE()')
+    assert_equal date_base, date_proc
+  end
+
 end

test/schema/sqlserver_specific_schema.rb

@@ -119,6 +119,12 @@
   end
   execute "sp_bindefault 'sst_getdateobject', 'sst_defaultobjects.date'"
 
+  execute "DROP PROCEDURE my_getutcdate" rescue nil
+  execute <<-SQL
+    CREATE PROCEDURE my_getutcdate AS
+    SELECT GETUTCDATE() utcdate
+  SQL
+
   # Constraints
 
   create_table(:sst_has_fks, force: true) { |t| t.column(:fk_id, :integer, null: false) }