Merge branch '21535-multi-wf-delete'

[arvados.git] / services / api / lib / db_current_time.rb

diff --git a/services/api/lib/db_current_time.rb b/services/api/lib/db_current_time.rb
index fdb66415210aed9b95338f6dafc6e377de45ec50..2d58e3c3894fc0ccf35732fa8d28096672bfdf9c 100644 (file)
--- a/services/api/lib/db_current_time.rb
+++ b/services/api/lib/db_current_time.rb
@@ -3,9 +3,13 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 module DbCurrentTime
-  CURRENT_TIME_SQL = "SELECT clock_timestamp()"
+  CURRENT_TIME_SQL = "SELECT clock_timestamp() AT TIME ZONE 'UTC'"
 
   def db_current_time
-    Time.parse(ActiveRecord::Base.connection.select_value(CURRENT_TIME_SQL)).to_time
+    ActiveRecord::Base.connection.select_value(CURRENT_TIME_SQL)
+  end
+
+  def db_transaction_time
+    ActiveRecord::Base.connection.select_value("SELECT current_timestamp AT TIME ZONE 'UTC'")
   end
 end