135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#949 replace other occurances of now() with LOCALTIMESTAMP

Browse Source
This commit is contained in:
Oliver Gorwits
2023-03-03 14:21:18 +00:00
parent d9a384d1d0
commit cbc32eb032
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm
View File

@@ -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
});

2
lib/App/Netdisco/DB/Result/Virtual/CidrIps.pm
View File

@@ -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 (

6
lib/App/Netdisco/DB/Result/Virtual/LastNode.pm
View File

@@ -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' },

2
lib/App/Netdisco/DB/Result/Virtual/NodeWithAge.pm
View File

@@ -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
});

4
lib/App/Netdisco/DB/Result/Virtual/UserRole.pm
View File

@@ -28,11 +28,11 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
UNION
SELECT username, 'api' 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) - ?)
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
);

8
lib/App/Netdisco/DB/ResultSet/Device.pm
View File

@@ -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)))",
},
});
}