Merge branch 'master' of github.com:netdisco/netdisco

lib/App/Netdisco/DB.pm

@@ -11,7 +11,7 @@ __PACKAGE__->load_namespaces(
 );
 
 our # try to hide from kwalitee
-  $VERSION = 57; # schema version used for upgrades, keep as integer
+  $VERSION = 58; # schema version used for upgrades, keep as integer
 
 use Path::Class;
 use File::ShareDir 'dist_dir';

lib/App/Netdisco/DB/Result/DevicePort.pm

@@ -56,13 +56,13 @@ __PACKAGE__->add_columns(
   "remote_id",
   { data_type => "text", is_nullable => 1 },
   "is_master",
-  { data_type => "bool", is_nullable => 0, default_value => \"false" },
+  { data_type => "boolean", is_nullable => 0, default_value => \"false" },
   "slave_of",
   { data_type => "text", is_nullable => 1 },
   "manual_topo",
-  { data_type => "bool", is_nullable => 0, default_value => \"false" },
+  { data_type => "boolean", is_nullable => 0, default_value => \"false" },
   "is_uplink",
-  { data_type => "bool", is_nullable => 1 },
+  { data_type => "boolean", is_nullable => 1 },
   "vlan",
   { data_type => "text", is_nullable => 1 },
   "pvid",

lib/App/Netdisco/DB/Result/DevicePortProperties.pm

@@ -14,9 +14,9 @@ __PACKAGE__->add_columns(
   "error_disable_cause",
   { data_type => "text", is_nullable => 1 },
   "remote_is_wap",
-  { data_type => "boolean", is_nullable => 1 },
+  { data_type => "boolean", default_value => \"false", is_nullable => 1 },
   "remote_is_phone",
-  { data_type => "boolean", is_nullable => 1 },
+  { data_type => "boolean", default_value => \"false", is_nullable => 1 },
   "remote_vendor",
   { data_type => "text", is_nullable => 1 },
   "remote_model",
@@ -26,9 +26,9 @@ __PACKAGE__->add_columns(
   "remote_serial",
   { data_type => "text", is_nullable => 1 },
   "raw_speed",
-  { data_type => "bigint", is_nullable => 1 },
+  { data_type => "bigint", default_value => 0, is_nullable => 1 },
   "faststart",
-  { data_type => "boolean", is_nullable => 1 },
+  { data_type => "boolean", default_value => \"false", is_nullable => 1 },
   "ifindex",
   { data_type => "bigint", is_nullable => 1 },
 );

lib/App/Netdisco/DB/Result/DevicePortSsid.pm

@@ -19,10 +19,10 @@ __PACKAGE__->add_columns(
   "broadcast",
   { data_type => "boolean", is_nullable => 1 },
   "bssid",
-  { data_type => "macaddr", is_nullable => 1 },
+  { data_type => "macaddr", is_nullable => 0 },
 );
 
-__PACKAGE__->set_primary_key("port", "ip");
+__PACKAGE__->set_primary_key("ip", "bssid", "port");
 
 # Created by DBIx::Class::Schema::Loader v0.07015 @ 2012-01-07 14:20:02
 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:zvgylKzUQtizJZCe1rEdUg

lib/App/Netdisco/DB/Result/DeviceRoute.pm

@@ -1,42 +0,0 @@
-use utf8;
-package App::Netdisco::DB::Result::DeviceRoute;
-
-# Created by DBIx::Class::Schema::Loader
-# DO NOT MODIFY THE FIRST PART OF THIS FILE
-
-use strict;
-use warnings;
-
-use base 'DBIx::Class::Core';
-__PACKAGE__->table("device_route");
-__PACKAGE__->add_columns(
-  "ip",
-  { data_type => "inet", is_nullable => 0 },
-  "network",
-  { data_type => "cidr", is_nullable => 0 },
-  "creation",
-  {
-    data_type     => "timestamp",
-    default_value => \"current_timestamp",
-    is_nullable   => 1,
-    original      => { default_value => \"now()" },
-  },
-  "dest",
-  { data_type => "inet", is_nullable => 0 },
-  "last_discover",
-  {
-    data_type     => "timestamp",
-    default_value => \"current_timestamp",
-    is_nullable   => 1,
-    original      => { default_value => \"now()" },
-  },
-);
-__PACKAGE__->set_primary_key("ip", "network", "dest");
-
-
-# Created by DBIx::Class::Schema::Loader v0.07015 @ 2012-01-07 14:20:02
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3jcvPP60E5BvwnUbXql7mQ
-
-
-# You can replace this text with custom code or comments, and it will be preserved on regeneration
-1;

lib/App/Netdisco/DB/Result/NodeWireless.pm

@@ -25,9 +25,9 @@ __PACKAGE__->add_columns(
   "sigqual",
   { data_type => "integer", is_nullable => 1 },
   "rxpkt",
-  { data_type => "integer", is_nullable => 1 },
+  { data_type => "bigint", is_nullable => 1 },
   "txpkt",
-  { data_type => "integer", is_nullable => 1 },
+  { data_type => "bigint", is_nullable => 1 },
   "rxbyte",
   { data_type => "bigint", is_nullable => 1 },
   "txbyte",

lib/App/Netdisco/DB/Result/Statistics.pm

@@ -8,8 +8,7 @@ use base 'DBIx::Class::Core';
 __PACKAGE__->table("statistics");
 __PACKAGE__->add_columns(
   "day",
-  { data_type => "date", is_nullable => 0 },
-
+  { data_type => "date", default_value => \"CURRENT_DATE", is_nullable => 0 },
   "device_count",
   { data_type => "integer", is_nullable => 0 },
   "device_ip_count",
@@ -28,7 +27,6 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_nullable => 0 },
   "node_active_count",
   { data_type => "integer", is_nullable => 0 },
-
   "netdisco_ver",
   { data_type => "text", is_nullable => 1 },
   "snmpinfo_ver",