From cbc32eb03278a39ea7a5df577af353e675d67ae9 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 3 Mar 2023 14:21:18 +0000 Subject: [PATCH] #949 replace other occurances of now() with LOCALTIMESTAMP --- lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm | 2 +- lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm | 2 +- lib/App/Netdisco/DB/Result/Virtual/LastNode.pm | 6 +++--- lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm | 2 +- lib/App/Netdisco/DB/Result/Virtual/UserRole.pm | 4 ++-- lib/App/Netdisco/DB/ResultSet/Device.pm | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm b/lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm index 39097275..db4731bb 100644 --- a/lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm +++ b/lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm @@ -14,7 +14,7 @@ __PACKAGE__->table("active_node_with_age"); __PACKAGE__->result_source_instance->is_virtual(1); __PACKAGE__->result_source_instance->view_definition(q{ SELECT *, - replace( date_trunc( 'minute', age( now(), time_last + interval '30 second' ) ) ::text, 'mon', 'month') + replace( date_trunc( 'minute', age( LOCALTIMESTAMP, time_last + interval '30 second' ) ) ::text, 'mon', 'month') AS time_last_age FROM node WHERE active }); diff --git a/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm b/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm index 5d39885d..79651584 100644 --- a/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm +++ b/lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm @@ -18,7 +18,7 @@ SELECT host(network (prefix) + sub.int)::inet AS ip, NULL::text AS dns, false::boolean AS active, false::boolean AS node, - replace( date_trunc( 'minute', age( now(), NULL::timestamp ) ) ::text, 'mon', 'month') AS age, + replace( date_trunc( 'minute', age( LOCALTIMESTAMP, NULL::timestamp ) ) ::text, 'mon', 'month') AS age, NULL::text AS vendor, NULL::text AS nbname FROM ( diff --git a/lib/App/Netdisco/DB/Result/Virtual/LastNode.pm b/lib/App/Netdisco/DB/Result/Virtual/LastNode.pm index 8385a8ab..2d228aa6 100644 --- a/lib/App/Netdisco/DB/Result/Virtual/LastNode.pm +++ b/lib/App/Netdisco/DB/Result/Virtual/LastNode.pm @@ -31,21 +31,21 @@ __PACKAGE__->add_columns( data_type => "timestamp", default_value => \"current_timestamp", is_nullable => 1, - original => { default_value => \"now()" }, + original => { default_value => \"LOCALTIMESTAMP" }, }, "time_recent", { data_type => "timestamp", default_value => \"current_timestamp", is_nullable => 1, - original => { default_value => \"now()" }, + original => { default_value => \"LOCALTIMESTAMP" }, }, "time_last", { data_type => "timestamp", default_value => \"current_timestamp", is_nullable => 1, - original => { default_value => \"now()" }, + original => { default_value => \"LOCALTIMESTAMP" }, }, "vlan", { data_type => "text", is_nullable => 0, default_value => '0' }, diff --git a/lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm b/lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm index 94a98ef9..8d702237 100644 --- a/lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm +++ b/lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm @@ -14,7 +14,7 @@ __PACKAGE__->table("node_with_age"); __PACKAGE__->result_source_instance->is_virtual(1); __PACKAGE__->result_source_instance->view_definition(q{ SELECT *, - replace( date_trunc( 'minute', age( now(), time_last + interval '30 second' ) ) ::text, 'mon', 'month') + replace( date_trunc( 'minute', age( LOCALTIMESTAMP, time_last + interval '30 second' ) ) ::text, 'mon', 'month') AS time_last_age FROM node }); diff --git a/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm b/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm index 1f27206b..12e0da84 100644 --- a/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm +++ b/lib/App/Netdisco/DB/Result/Virtual/UserRole.pm @@ -28,11 +28,11 @@ __PACKAGE__->result_source_instance->view_definition(< (EXTRACT(EPOCH FROM now()) - ?) + AND token_from > (EXTRACT(EPOCH FROM LOCALTIMESTAMP) - ?) UNION SELECT username, 'api_admin' AS role FROM users WHERE token IS NOT NULL AND token_from IS NOT NULL - AND token_from > (EXTRACT(EPOCH FROM now()) - ?) + AND token_from > (EXTRACT(EPOCH FROM LOCALTIMESTAMP) - ?) AND admin ENDSQL ); diff --git a/lib/App/Netdisco/DB/ResultSet/Device.pm b/lib/App/Netdisco/DB/ResultSet/Device.pm index 0afbc80e..f3638ea8 100644 --- a/lib/App/Netdisco/DB/ResultSet/Device.pm +++ b/lib/App/Netdisco/DB/ResultSet/Device.pm @@ -93,10 +93,10 @@ sub with_times { last_discover_stamp => \"to_char(me.last_discover, 'YYYY-MM-DD HH24:MI')", last_macsuck_stamp => \"to_char(me.last_macsuck, 'YYYY-MM-DD HH24:MI')", last_arpnip_stamp => \"to_char(me.last_arpnip, 'YYYY-MM-DD HH24:MI')", - since_first_seen => \"extract(epoch from (age(now(), me.creation)))", - since_last_discover => \"extract(epoch from (age(now(), me.last_discover)))", - since_last_macsuck => \"extract(epoch from (age(now(), me.last_macsuck)))", - since_last_arpnip => \"extract(epoch from (age(now(), me.last_arpnip)))", + since_first_seen => \"extract(epoch from (age(LOCALTIMESTAMP, me.creation)))", + since_last_discover => \"extract(epoch from (age(LOCALTIMESTAMP, me.last_discover)))", + since_last_macsuck => \"extract(epoch from (age(LOCALTIMESTAMP, me.last_macsuck)))", + since_last_arpnip => \"extract(epoch from (age(LOCALTIMESTAMP, me.last_arpnip)))", }, }); }