16349: Test token expiry using actual token validation func.

[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 5c97baa66e0a217b178d66cb16c35bc446395ed8..80516521b4524f79950522325c945b22220d3538 100644 (file)
--- a/services/api/lib/db_current_time.rb
+++ b/services/api/lib/db_current_time.rb
@@ -1,7 +1,15 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 module DbCurrentTime
   CURRENT_TIME_SQL = "SELECT clock_timestamp()"
 
   def db_current_time
-    ActiveRecord::Base.connection.select_value(CURRENT_TIME_SQL).to_time
+    Time.parse(ActiveRecord::Base.connection.select_value(CURRENT_TIME_SQL)).to_time
+  end
+
+  def db_transaction_time
+    Time.parse(ActiveRecord::Base.connection.select_value('SELECT current_timestamp')).to_time
   end
 end