From a33c25b67b04f8a7a72931d3edd639e9c8014b5f Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 9 Jan 2012 08:31:37 +0000 Subject: [PATCH] add strictures to resultsets --- Netdisco/lib/Netdisco/DB/Result/NodeIp.pm | 8 +++++--- Netdisco/lib/Netdisco/DB/ResultSet/Device.pm | 4 +++- Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm | 3 +++ Netdisco/lib/Netdisco/DB/ResultSet/Node.pm | 3 +++ Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm | 3 +++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Netdisco/lib/Netdisco/DB/Result/NodeIp.pm b/Netdisco/lib/Netdisco/DB/Result/NodeIp.pm index dbaefaf4..a35103b5 100644 --- a/Netdisco/lib/Netdisco/DB/Result/NodeIp.pm +++ b/Netdisco/lib/Netdisco/DB/Result/NodeIp.pm @@ -37,12 +37,14 @@ __PACKAGE__->set_primary_key("mac", "ip"); # Created by DBIx::Class::Schema::Loader v0.07015 @ 2012-01-07 14:20:02 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9+CuvuVWH88WxAf6IBij8g -# some customize their node_ip table to have a dns column which -# is the cached record at the time of discovery - +# XXX uncomment the following two lines if you have a "dns" column XXX +# XXX in your node_ip table which caches the host's name XXX __PACKAGE__->add_column("dns" => { data_type => "text", is_nullable => 1, accessor => undef }); +# XXX ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ XXX +# some customize their node_ip table to have a dns column which +# is the cached record at the time of discovery sub dns { my $row = shift; return $row->get_column('dns') diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm b/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm index 8d7333ab..34b06e18 100644 --- a/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm +++ b/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm @@ -1,6 +1,8 @@ package Netdisco::DB::ResultSet::Device; use base 'DBIx::Class::ResultSet'; +use strict; +use warnings FATAL => 'all'; use NetAddr::IP::Lite ':lower'; # override the built-in so we can munge some columns @@ -10,7 +12,7 @@ sub find { return $set->SUPER::find($ip, { '+select' => [ - \"replace(age(timestamp 'epoch' + uptime / 100 * interval '1 second', timestamp '1970-01-01 00:00:00-00')::text, 'mons', 'months')", + \"replace(age(timestamp 'epoch' + uptime / 100 * interval '1 second', timestamp '1970-01-01 00:00:00-00')::text, 'mon', 'month')", \"to_char(last_discover, 'YYYY-MM-DD HH24:MI')", \"to_char(last_macsuck, 'YYYY-MM-DD HH24:MI')", \"to_char(last_arpnip, 'YYYY-MM-DD HH24:MI')", diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm b/Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm index 605d169a..56756a9a 100644 --- a/Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm +++ b/Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm @@ -1,6 +1,9 @@ package Netdisco::DB::ResultSet::DevicePort; use base 'DBIx::Class::ResultSet'; +use strict; +use warnings FATAL => 'all'; + sub by_mac { my ($set, $mac) = @_; return $set unless $mac; diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/Node.pm b/Netdisco/lib/Netdisco/DB/ResultSet/Node.pm index da472b25..fbbce049 100644 --- a/Netdisco/lib/Netdisco/DB/ResultSet/Node.pm +++ b/Netdisco/lib/Netdisco/DB/ResultSet/Node.pm @@ -1,6 +1,9 @@ package Netdisco::DB::ResultSet::Node; use base 'DBIx::Class::ResultSet'; +use strict; +use warnings FATAL => 'all'; + sub by_mac { my ($set, $archive, $mac) = @_; return $set unless $mac; diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm b/Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm index 92fba8b5..df1f15a3 100644 --- a/Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm +++ b/Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm @@ -1,6 +1,9 @@ package Netdisco::DB::ResultSet::NodeIp; use base 'DBIx::Class::ResultSet'; +use strict; +use warnings FATAL => 'all'; + # some customize their node_ip table to have a dns column which # is the cached record at the time of discovery sub has_dns_col {