projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20203: Fix global var reset on db reset; skip in non-test mode.
[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..5e1634ecb96f17661002afc3eb62dea44100adad 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
module DbCurrentTime
- CURRENT_TIME_SQL = "SELECT clock_timestamp()"
+ CURRENT_TIME_SQL = "SELECT clock_timestamp()
AT TIME ZONE 'UTC'
"
def db_current_time
def db_current_time
- ActiveRecord::Base.connection.select_value(CURRENT_TIME_SQL).to_time
+ Time.parse(ActiveRecord::Base.connection.select_value(CURRENT_TIME_SQL) + " +0000")
+ end
+
+ def db_transaction_time
+ Time.parse(ActiveRecord::Base.connection.select_value("SELECT current_timestamp AT TIME ZONE 'UTC'") + " +0000")
end
end
end
end