#949 inconsistencies in time values due to time zone handling

2023-03-03 15:01:06 +00:00
parent 9ade0b21dd
commit 1d00ebc91e
22 changed files with 111 additions and 56 deletions
--- a/lib/App/Netdisco/DB.pm
+++ b/lib/App/Netdisco/DB.pm
@@ -11,7 +11,7 @@ __PACKAGE__->load_namespaces(
 );

 our # try to hide from kwalitee
-  $VERSION = 77; # schema version used for upgrades, keep as integer
+  $VERSION = 78; # schema version used for upgrades, keep as integer

 use Path::Class;
 use File::ShareDir 'dist_dir';
--- a/lib/App/Netdisco/DB/Result/Admin.pm
+++ b/lib/App/Netdisco/DB/Result/Admin.pm
@@ -18,9 +18,9 @@ __PACKAGE__->add_columns(
  "entered",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "started",
  { data_type => "timestamp", is_nullable => 1 },
--- a/lib/App/Netdisco/DB/Result/Device.pm
+++ b/lib/App/Netdisco/DB/Result/Device.pm
@@ -17,9 +17,9 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "dns",
  { data_type => "text", is_nullable => 1 },
--- a/lib/App/Netdisco/DB/Result/DeviceIp.pm
+++ b/lib/App/Netdisco/DB/Result/DeviceIp.pm
@@ -23,9 +23,9 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
 );
 __PACKAGE__->set_primary_key("ip", "alias");
--- a/lib/App/Netdisco/DB/Result/DeviceModule.pm
+++ b/lib/App/Netdisco/DB/Result/DeviceModule.pm
@@ -39,9 +39,9 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "last_discover",
  { data_type => "timestamp", is_nullable => 1 },
--- a/lib/App/Netdisco/DB/Result/DevicePort.pm
+++ b/lib/App/Netdisco/DB/Result/DevicePort.pm
@@ -19,9 +19,9 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "descr",
  { data_type => "text", is_nullable => 1 },
--- a/lib/App/Netdisco/DB/Result/DevicePortLog.pm
+++ b/lib/App/Netdisco/DB/Result/DevicePortLog.pm
@@ -32,9 +32,9 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
 );

--- a/lib/App/Netdisco/DB/Result/DevicePortVlan.pm
+++ b/lib/App/Netdisco/DB/Result/DevicePortVlan.pm
@@ -21,16 +21,16 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "last_discover",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "vlantype",
  { data_type => "text", is_nullable => 1 },
--- a/lib/App/Netdisco/DB/Result/DeviceVlan.pm
+++ b/lib/App/Netdisco/DB/Result/DeviceVlan.pm
@@ -17,16 +17,16 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "last_discover",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
 );
 __PACKAGE__->set_primary_key("ip", "vlan");
--- a/lib/App/Netdisco/DB/Result/Log.pm
+++ b/lib/App/Netdisco/DB/Result/Log.pm
@@ -18,9 +18,9 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "class",
  { data_type => "text", is_nullable => 1 },
--- a/lib/App/Netdisco/DB/Result/Node.pm
+++ b/lib/App/Netdisco/DB/Result/Node.pm
@@ -23,23 +23,23 @@ __PACKAGE__->add_columns(
  "time_first",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "time_recent",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "time_last",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "vlan",
  { data_type => "text", is_nullable => 0, default_value => '0' },
--- a/lib/App/Netdisco/DB/Result/NodeIp.pm
+++ b/lib/App/Netdisco/DB/Result/NodeIp.pm
@@ -21,16 +21,16 @@ __PACKAGE__->add_columns(
  "time_first",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "time_last",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
 );
 __PACKAGE__->set_primary_key("mac", "ip");
--- a/lib/App/Netdisco/DB/Result/NodeMonitor.pm
+++ b/lib/App/Netdisco/DB/Result/NodeMonitor.pm
@@ -21,9 +21,9 @@ __PACKAGE__->add_columns(
  "date",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
 );
 __PACKAGE__->set_primary_key("mac");
--- a/lib/App/Netdisco/DB/Result/NodeNbt.pm
+++ b/lib/App/Netdisco/DB/Result/NodeNbt.pm
@@ -27,16 +27,16 @@ __PACKAGE__->add_columns(
  "time_first",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "time_last",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
 );
 __PACKAGE__->set_primary_key("mac");
--- a/lib/App/Netdisco/DB/Result/NodeWireless.pm
+++ b/lib/App/Netdisco/DB/Result/NodeWireless.pm
@@ -33,9 +33,9 @@ __PACKAGE__->add_columns(
  "time_last",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "ssid",
  { data_type => "text", is_nullable => 0, default_value => '' },
--- a/lib/App/Netdisco/DB/Result/Process.pm
+++ b/lib/App/Netdisco/DB/Result/Process.pm
@@ -21,9 +21,9 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
 );

--- a/lib/App/Netdisco/DB/Result/Session.pm
+++ b/lib/App/Netdisco/DB/Result/Session.pm
@@ -13,9 +13,9 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "a_session",
  { data_type => "text", is_nullable => 1 },
--- a/lib/App/Netdisco/DB/Result/Subnet.pm
+++ b/lib/App/Netdisco/DB/Result/Subnet.pm
@@ -13,16 +13,16 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "last_discover",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
 );
 __PACKAGE__->set_primary_key("net");
--- a/lib/App/Netdisco/DB/Result/User.pm
+++ b/lib/App/Netdisco/DB/Result/User.pm
@@ -19,9 +19,9 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "last_on",
  { data_type => "timestamp", is_nullable => 1 },
--- a/lib/App/Netdisco/DB/Result/UserLog.pm
+++ b/lib/App/Netdisco/DB/Result/UserLog.pm
@@ -26,9 +26,9 @@ __PACKAGE__->add_columns(
  "creation",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
-    original      => { default_value => \"now()" },
+    original      => { default_value => \"LOCALTIMESTAMP" },
  },
 );

--- a/lib/App/Netdisco/DB/Result/Virtual/LastNode.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/LastNode.pm
@@ -29,21 +29,21 @@ __PACKAGE__->add_columns(
  "time_first",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "time_recent",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
    original      => { default_value => \"LOCALTIMESTAMP" },
  },
  "time_last",
  {
    data_type     => "timestamp",
-    default_value => \"current_timestamp",
+    default_value => \"LOCALTIMESTAMP",
    is_nullable   => 1,
    original      => { default_value => \"LOCALTIMESTAMP" },
  },
--- a/share/schema_versions/App-Netdisco-DB-77-78-PostgreSQL.sql
+++ b/share/schema_versions/App-Netdisco-DB-77-78-PostgreSQL.sql
@@ -0,0 +1,55 @@
+BEGIN;
+
+ALTER TABLE admin ALTER entered SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE device ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE device_ip ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE device_module ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE device_port ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE device_port_log ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE device_port_vlan ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE device_port_vlan ALTER last_discover SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE device_vlan ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE device_vlan ALTER last_discover SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE log ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE node ALTER time_first SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE node ALTER time_recent SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE node ALTER time_last SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE node_ip ALTER time_first SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE node_ip ALTER time_last SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE node_monitor ALTER date SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE node_nbt ALTER time_first SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE node_nbt ALTER time_last SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE node_wireless ALTER time_last SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE process ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE sessions ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE subnets ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE subnets ALTER last_discover SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE users ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+ALTER TABLE user_log ALTER creation SET DEFAULT LOCALTIMESTAMP;
+
+COMMIT;