Merge pull request #51 from gocardless/rails-6

Be more resilient against unexpected time values.
gocardless · Sep 30, 2019 · 65b0c56 · 65b0c56
2 parents 21a9fa3 + 9b14710
commit 65b0c56
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/que/adapters/base.rb b/lib/que/adapters/base.rb
@@ -107,7 +107,13 @@ def execute_prepared(name, params)
         # json
         114 => ->(value) { JSON_MODULE.load(value, create_additions: false) },
         # timestamp with time zone
-        1184 => Time.method(:parse),
+        1184 => ->(value) {
+          case value
+          when Time then value
+          when String then Time.parse(value)
+          else raise "Unexpected time class: #{value.class} (#{value.inspect})"
+          end
+        },
       }.freeze
 
       def cast_result(result)