From c94e890bb9d4d0fcf2a0b51fc91cbb75498c6733 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 4 Mar 2013 23:45:36 +0000 Subject: [PATCH] DB Schema upgrades are now all single-step in case user has applied any already --- Netdisco/Changes | 1 + Netdisco/bin/netdisco-deploy | 11 +- Netdisco/lib/App/Netdisco/DB.pm | 2 +- .../App-Netdisco-DB-1-3-PostgreSQL.sql | 438 ------------------ .../App-Netdisco-DB-10-11-PostgreSQL.sql | 8 + .../App-Netdisco-DB-11-12-PostgreSQL.sql | 8 + .../App-Netdisco-DB-12-13-PostgreSQL.sql | 8 + .../App-Netdisco-DB-13-14-PostgreSQL.sql | 8 + .../App-Netdisco-DB-14-15-PostgreSQL.sql | 8 + .../App-Netdisco-DB-15-16-PostgreSQL.sql | 8 + ....sql => App-Netdisco-DB-16-PostgreSQL.sql} | 0 .../App-Netdisco-DB-2-3-PostgreSQL.sql | 13 - .../App-Netdisco-DB-3-4-PostgreSQL.sql | 16 - .../App-Netdisco-DB-4-5-PostgreSQL.sql | 13 + .../App-Netdisco-DB-5-6-PostgreSQL.sql | 8 + .../App-Netdisco-DB-6-7-PostgreSQL.sql | 8 + .../App-Netdisco-DB-7-8-PostgreSQL.sql | 8 + .../App-Netdisco-DB-8-9-PostgreSQL.sql | 8 + ...L.sql => App-Netdisco-DB-8-PostgreSQL.sql} | 0 .../App-Netdisco-DB-9-10-PostgreSQL.sql | 8 + TODO | 1 - 21 files changed, 111 insertions(+), 472 deletions(-) delete mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-3-PostgreSQL.sql create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-11-12-PostgreSQL.sql create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-12-13-PostgreSQL.sql create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-13-14-PostgreSQL.sql create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-14-15-PostgreSQL.sql create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-15-16-PostgreSQL.sql rename Netdisco/lib/App/Netdisco/DB/schema_versions/{App-Netdisco-DB-4-PostgreSQL.sql => App-Netdisco-DB-16-PostgreSQL.sql} (100%) create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-5-PostgreSQL.sql create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql rename Netdisco/lib/App/Netdisco/DB/schema_versions/{App-Netdisco-DB-3-PostgreSQL.sql => App-Netdisco-DB-8-PostgreSQL.sql} (100%) create mode 100644 Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql diff --git a/Netdisco/Changes b/Netdisco/Changes index e8918b27..f922105b 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -21,6 +21,7 @@ * Search by device port MAC no longer fatal * URI and HTML escape template variables * Prevent duplicate requets caused by favicon.ico link + * DB Schema upgrades are now all single-step in case user has applied any already 2.005000_002 - 2013-02-10 diff --git a/Netdisco/bin/netdisco-deploy b/Netdisco/bin/netdisco-deploy index afc70fac..04f3b256 100755 --- a/Netdisco/bin/netdisco-deploy +++ b/Netdisco/bin/netdisco-deploy @@ -20,11 +20,16 @@ BEGIN { } BEGIN { - # stuff useful locations into @INC + # stuff useful locations into @INC and $PATH + my $location = $FindBin::RealBin; + use Path::Class; unshift @INC, - dir($FindBin::RealBin)->parent->subdir('lib')->stringify, - dir($FindBin::RealBin, 'lib')->stringify; + dir($location)->parent->subdir('lib')->stringify, + dir($location, 'lib')->stringify; + + use Config; + $ENV{PATH} = $location . $Config{path_sep} . $ENV{PATH}; } use App::Netdisco; diff --git a/Netdisco/lib/App/Netdisco/DB.pm b/Netdisco/lib/App/Netdisco/DB.pm index 469aaec6..938bb7d0 100644 --- a/Netdisco/lib/App/Netdisco/DB.pm +++ b/Netdisco/lib/App/Netdisco/DB.pm @@ -15,7 +15,7 @@ __PACKAGE__->load_namespaces; # Created by DBIx::Class::Schema::Loader v0.07015 @ 2012-01-07 14:20:02 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tQTf/oInVydRDsuIFLSU4A -our $VERSION = 4; # schema version used for upgrades, keep as integer +our $VERSION = 16; # schema version used for upgrades, keep as integer use Path::Class; use File::Basename; diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-3-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-3-PostgreSQL.sql deleted file mode 100644 index e732636f..00000000 --- a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-1-3-PostgreSQL.sql +++ /dev/null @@ -1,438 +0,0 @@ --- --- Created by SQL::Translator::Producer::PostgreSQL --- Created on Wed Oct 10 15:38:36 2012 --- --- --- Table: admin. --- -CREATE TABLE "admin" ( - "job" serial NOT NULL, - "entered" timestamp DEFAULT current_timestamp, - "started" timestamp, - "finished" timestamp, - "device" inet, - "port" text, - "action" text, - "subaction" text, - "status" text, - "username" text, - "userip" inet, - "log" text, - "debug" boolean -); - --- --- Table: device. --- -CREATE TABLE "device" ( - "ip" inet NOT NULL, - "creation" timestamp DEFAULT current_timestamp, - "dns" text, - "description" text, - "uptime" bigint, - "contact" text, - "name" text, - "location" text, - "layers" character varying(8), - "ports" integer, - "mac" macaddr, - "serial" text, - "model" text, - "ps1_type" text, - "ps2_type" text, - "ps1_status" text, - "ps2_status" text, - "fan" text, - "slots" integer, - "vendor" text, - "os" text, - "os_ver" text, - "log" text, - "snmp_ver" integer, - "snmp_comm" text, - "snmp_class" text, - "vtp_domain" text, - "last_discover" timestamp, - "last_macsuck" timestamp, - "last_arpnip" timestamp, - PRIMARY KEY ("ip") -); - --- --- Table: device_module. --- -CREATE TABLE "device_module" ( - "ip" inet NOT NULL, - "index" integer NOT NULL, - "description" text, - "type" text, - "parent" integer, - "name" text, - "class" text, - "pos" integer, - "hw_ver" text, - "fw_ver" text, - "sw_ver" text, - "serial" text, - "model" text, - "fru" boolean, - "creation" timestamp DEFAULT current_timestamp, - "last_discover" timestamp, - PRIMARY KEY ("ip", "index") -); - --- --- Table: device_port_log. --- -CREATE TABLE "device_port_log" ( - "id" serial NOT NULL, - "ip" inet, - "port" text, - "reason" text, - "log" text, - "username" text, - "userip" inet, - "action" text, - "creation" timestamp DEFAULT current_timestamp -); - --- --- Table: device_port_power. --- -CREATE TABLE "device_port_power" ( - "ip" inet NOT NULL, - "port" text NOT NULL, - "module" integer, - "admin" text, - "status" text, - "class" text, - "power" integer, - PRIMARY KEY ("port", "ip") -); - --- --- Table: device_port_ssid. --- -CREATE TABLE "device_port_ssid" ( - "ip" inet, - "port" text, - "ssid" text, - "broadcast" boolean, - "bssid" macaddr -); - --- --- Table: device_port_wireless. --- -CREATE TABLE "device_port_wireless" ( - "ip" inet, - "port" text, - "channel" integer, - "power" integer -); - --- --- Table: device_power. --- -CREATE TABLE "device_power" ( - "ip" inet NOT NULL, - "module" integer NOT NULL, - "power" integer, - "status" text, - PRIMARY KEY ("ip", "module") -); - --- --- Table: device_route. --- -CREATE TABLE "device_route" ( - "ip" inet NOT NULL, - "network" cidr NOT NULL, - "creation" timestamp DEFAULT current_timestamp, - "dest" inet NOT NULL, - "last_discover" timestamp DEFAULT current_timestamp, - PRIMARY KEY ("ip", "network", "dest") -); - --- --- Table: log. --- -CREATE TABLE "log" ( - "id" serial NOT NULL, - "creation" timestamp DEFAULT current_timestamp, - "class" text, - "entry" text, - "logfile" text -); - --- --- Table: node_ip. --- -CREATE TABLE "node_ip" ( - "mac" macaddr NOT NULL, - "ip" inet NOT NULL, - "active" boolean, - "time_first" timestamp DEFAULT current_timestamp, - "time_last" timestamp DEFAULT current_timestamp, - "dns" text, - PRIMARY KEY ("mac", "ip") -); - --- --- Table: node_monitor. --- -CREATE TABLE "node_monitor" ( - "mac" macaddr NOT NULL, - "active" boolean, - "why" text, - "cc" text, - "date" timestamp DEFAULT current_timestamp, - PRIMARY KEY ("mac") -); - --- --- Table: node_nbt. --- -CREATE TABLE "node_nbt" ( - "mac" macaddr NOT NULL, - "ip" inet, - "nbname" text, - "domain" text, - "server" boolean, - "nbuser" text, - "active" boolean, - "time_first" timestamp DEFAULT current_timestamp, - "time_last" timestamp DEFAULT current_timestamp, - PRIMARY KEY ("mac") -); - --- --- Table: node_wireless. --- -CREATE TABLE "node_wireless" ( - "mac" macaddr NOT NULL, - "uptime" integer, - "maxrate" integer, - "txrate" integer, - "sigstrength" integer, - "sigqual" integer, - "rxpkt" integer, - "txpkt" integer, - "rxbyte" bigint, - "txbyte" bigint, - "time_last" timestamp DEFAULT current_timestamp, - PRIMARY KEY ("mac") -); - --- --- Table: oui. --- -CREATE TABLE "oui" ( - "oui" character varying(8) NOT NULL, - "company" text, - PRIMARY KEY ("oui") -); - --- --- Table: process. --- -CREATE TABLE "process" ( - "controller" integer NOT NULL, - "device" inet NOT NULL, - "action" text NOT NULL, - "status" text, - "count" integer, - "creation" timestamp DEFAULT current_timestamp -); - --- --- Table: sessions. --- -CREATE TABLE "sessions" ( - "id" character(32) NOT NULL, - "creation" timestamp DEFAULT current_timestamp, - "a_session" text, - PRIMARY KEY ("id") -); - --- --- Table: subnets. --- -CREATE TABLE "subnets" ( - "net" cidr NOT NULL, - "creation" timestamp DEFAULT current_timestamp, - "last_discover" timestamp DEFAULT current_timestamp, - PRIMARY KEY ("net") -); - --- --- Table: topology. --- -CREATE TABLE "topology" ( - "dev1" inet NOT NULL, - "port1" text NOT NULL, - "dev2" inet NOT NULL, - "port2" text NOT NULL -); - --- --- Table: user_log. --- -CREATE TABLE "user_log" ( - "entry" serial NOT NULL, - "username" character varying(50), - "userip" inet, - "event" text, - "details" text, - "creation" timestamp DEFAULT current_timestamp -); - --- --- Table: users. --- -CREATE TABLE "users" ( - "username" character varying(50) NOT NULL, - "password" text, - "creation" timestamp DEFAULT current_timestamp, - "last_on" timestamp, - "port_control" boolean DEFAULT false, - "ldap" boolean DEFAULT false, - "admin" boolean DEFAULT false, - "fullname" text, - "note" text, - PRIMARY KEY ("username") -); - --- --- Table: device_vlan. --- -CREATE TABLE "device_vlan" ( - "ip" inet NOT NULL, - "vlan" integer NOT NULL, - "description" text, - "creation" timestamp DEFAULT current_timestamp, - "last_discover" timestamp DEFAULT current_timestamp, - PRIMARY KEY ("ip", "vlan") -); -CREATE INDEX "device_vlan_idx_ip" on "device_vlan" ("ip"); - --- --- Table: device_ip. --- -CREATE TABLE "device_ip" ( - "ip" inet NOT NULL, - "alias" inet NOT NULL, - "subnet" cidr, - "port" text, - "dns" text, - "creation" timestamp DEFAULT current_timestamp, - PRIMARY KEY ("ip", "alias"), - CONSTRAINT "device_ip_alias" UNIQUE ("alias") -); -CREATE INDEX "device_ip_idx_ip" on "device_ip" ("ip"); -CREATE INDEX "device_ip_idx_ip_port" on "device_ip" ("ip", "port"); - --- --- Table: device_port. --- -CREATE TABLE "device_port" ( - "ip" inet NOT NULL, - "port" text NOT NULL, - "creation" timestamp DEFAULT current_timestamp, - "descr" text, - "up" text, - "up_admin" text, - "type" text, - "duplex" text, - "duplex_admin" text, - "speed" text, - "name" text, - "mac" macaddr, - "mtu" integer, - "stp" text, - "remote_ip" inet, - "remote_port" text, - "remote_type" text, - "remote_id" text, - "vlan" text, - "pvid" integer, - "lastchange" bigint, - PRIMARY KEY ("port", "ip") -); -CREATE INDEX "device_port_idx_ip" on "device_port" ("ip"); -CREATE INDEX "device_port_idx_remote_ip" on "device_port" ("remote_ip"); - --- --- Table: device_port_vlan. --- -CREATE TABLE "device_port_vlan" ( - "ip" inet NOT NULL, - "port" text NOT NULL, - "vlan" integer NOT NULL, - "native" boolean DEFAULT false NOT NULL, - "creation" timestamp DEFAULT current_timestamp, - "last_discover" timestamp DEFAULT current_timestamp, - "vlantype" text, - PRIMARY KEY ("ip", "port", "vlan") -); -CREATE INDEX "device_port_vlan_idx_ip" on "device_port_vlan" ("ip"); -CREATE INDEX "device_port_vlan_idx_ip_port" on "device_port_vlan" ("ip", "port"); -CREATE INDEX "device_port_vlan_idx_ip_vlan" on "device_port_vlan" ("ip", "vlan"); - --- --- Table: node. --- -CREATE TABLE "node" ( - "mac" macaddr NOT NULL, - "switch" inet NOT NULL, - "port" text NOT NULL, - "active" boolean, - "oui" character varying(8), - "time_first" timestamp DEFAULT current_timestamp, - "time_recent" timestamp DEFAULT current_timestamp, - "time_last" timestamp DEFAULT current_timestamp, - PRIMARY KEY ("mac", "switch", "port") -); -CREATE INDEX "node_idx_switch" on "node" ("switch"); -CREATE INDEX "node_idx_switch_port" on "node" ("switch", "port"); -CREATE INDEX "node_idx_oui" on "node" ("oui"); - --- Not used in Netdisco, because they upset the legacy netdisco.pm code --- --- -- --- -- Foreign Key Definitions --- -- --- --- ALTER TABLE "device_vlan" ADD CONSTRAINT "device_vlan_fk_ip" FOREIGN KEY ("ip") --- REFERENCES "device" ("ip") ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE; --- --- ALTER TABLE "device_ip" ADD CONSTRAINT "device_ip_fk_ip" FOREIGN KEY ("ip") --- REFERENCES "device" ("ip") ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE; --- --- ALTER TABLE "device_ip" ADD CONSTRAINT "device_ip_fk_ip_port" FOREIGN KEY ("ip", "port") --- REFERENCES "device_port" ("ip", "port") DEFERRABLE; --- --- ALTER TABLE "device_port" ADD CONSTRAINT "device_port_fk_ip" FOREIGN KEY ("ip") --- REFERENCES "device" ("ip") ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE; --- --- ALTER TABLE "device_port" ADD CONSTRAINT "device_port_fk_remote_ip" FOREIGN KEY ("remote_ip") --- REFERENCES "device_ip" ("alias") DEFERRABLE; --- --- ALTER TABLE "device_port_vlan" ADD CONSTRAINT "device_port_vlan_fk_ip" FOREIGN KEY ("ip") --- REFERENCES "device" ("ip") ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE; --- --- ALTER TABLE "device_port_vlan" ADD CONSTRAINT "device_port_vlan_fk_ip_port" FOREIGN KEY ("ip", "port") --- REFERENCES "device_port" ("ip", "port") DEFERRABLE; --- --- ALTER TABLE "device_port_vlan" ADD CONSTRAINT "device_port_vlan_fk_ip_vlan" FOREIGN KEY ("ip", "vlan") --- REFERENCES "device_vlan" ("ip", "vlan") DEFERRABLE; --- --- ALTER TABLE "node" ADD CONSTRAINT "node_fk_switch" FOREIGN KEY ("switch") --- REFERENCES "device" ("ip") DEFERRABLE; --- --- ALTER TABLE "node" ADD CONSTRAINT "node_fk_switch_port" FOREIGN KEY ("switch", "port") --- REFERENCES "device_port" ("ip", "port") ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE; --- --- ALTER TABLE "node" ADD CONSTRAINT "node_fk_oui" FOREIGN KEY ("oui") --- REFERENCES "oui" ("oui") DEFERRABLE; --- diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql new file mode 100644 index 00000000..495f0c8f --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-10-11-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-PostgreSQL.sql' to '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-PostgreSQL.sql':; + +BEGIN; + +ALTER TABLE node ADD COLUMN vlan text DEFAULT '0' NOT NULL; + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-11-12-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-11-12-PostgreSQL.sql new file mode 100644 index 00000000..57a4fabe --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-11-12-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-PostgreSQL.sql' to '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-PostgreSQL.sql':; + +BEGIN; + +ALTER TABLE node_wireless ADD COLUMN ssid text DEFAULT '' NOT NULL; + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-12-13-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-12-13-PostgreSQL.sql new file mode 100644 index 00000000..267c6db3 --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-12-13-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-PostgreSQL.sql' to '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-PostgreSQL.sql':; + +BEGIN; + +CREATE INDEX device_port_power_idx_ip_port on device_port_power (ip, port); + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-13-14-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-13-14-PostgreSQL.sql new file mode 100644 index 00000000..20d75ac9 --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-13-14-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-PostgreSQL.sql' to '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-PostgreSQL.sql':; + +BEGIN; + +ALTER TABLE admin ADD PRIMARY KEY (job); + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-14-15-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-14-15-PostgreSQL.sql new file mode 100644 index 00000000..65a1dbfe --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-14-15-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-PostgreSQL.sql' to '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-PostgreSQL.sql':; + +BEGIN; + +ALTER TABLE node ADD PRIMARY KEY (mac, switch, port, vlan); + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-15-16-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-15-16-PostgreSQL.sql new file mode 100644 index 00000000..e8673459 --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-15-16-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-PostgreSQL.sql' to '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-PostgreSQL.sql':; + +BEGIN; + +ALTER TABLE node_wireless ADD PRIMARY KEY (mac, ssid); + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-16-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-PostgreSQL.sql rename to Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-16-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-3-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-3-PostgreSQL.sql index 41935c2f..4e2fd163 100644 --- a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-3-PostgreSQL.sql +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-2-3-PostgreSQL.sql @@ -2,18 +2,5 @@ BEGIN; -CREATE TABLE "topology" ( - "dev1" inet NOT NULL, - "port1" text NOT NULL, - "dev2" inet NOT NULL, - "port2" text NOT NULL -); - -ALTER TABLE device_port_ssid ADD COLUMN bssid macaddr; - -ALTER TABLE device_port_vlan ADD COLUMN vlantype text; - -ALTER TABLE node_ip ADD COLUMN dns text; - COMMIT; diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-4-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-4-PostgreSQL.sql index 42e38033..e0dac72b 100644 --- a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-4-PostgreSQL.sql +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-4-PostgreSQL.sql @@ -2,21 +2,5 @@ BEGIN; -ALTER TABLE node DROP CONSTRAINT node_pkey; - -ALTER TABLE node_wireless DROP CONSTRAINT node_wireless_pkey; - -ALTER TABLE node ADD COLUMN vlan text DEFAULT '0' NOT NULL; - -ALTER TABLE node_wireless ADD COLUMN ssid text DEFAULT '' NOT NULL; - -CREATE INDEX device_port_power_idx_ip_port on device_port_power (ip, port); - -ALTER TABLE admin ADD PRIMARY KEY (job); - -ALTER TABLE node ADD PRIMARY KEY (mac, switch, port, vlan); - -ALTER TABLE node_wireless ADD PRIMARY KEY (mac, ssid); - COMMIT; diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-5-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-5-PostgreSQL.sql new file mode 100644 index 00000000..136558bb --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-5-PostgreSQL.sql @@ -0,0 +1,13 @@ +-- Convert schema '/home/sy0/git/netdisco-frontend-sandpit/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql' to '/home/sy0/git/netdisco-frontend-sandpit/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql':; + +BEGIN; + +CREATE TABLE "topology" ( + "dev1" inet NOT NULL, + "port1" text NOT NULL, + "dev2" inet NOT NULL, + "port2" text NOT NULL +); + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql new file mode 100644 index 00000000..c160918f --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/sy0/git/netdisco-frontend-sandpit/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql' to '/home/sy0/git/netdisco-frontend-sandpit/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql':; + +BEGIN; + +ALTER TABLE device_port_ssid ADD COLUMN bssid macaddr; + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql new file mode 100644 index 00000000..520c2683 --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/sy0/git/netdisco-frontend-sandpit/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql' to '/home/sy0/git/netdisco-frontend-sandpit/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql':; + +BEGIN; + +ALTER TABLE device_port_vlan ADD COLUMN vlantype text; + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql new file mode 100644 index 00000000..d6ac9849 --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/sy0/git/netdisco-frontend-sandpit/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql' to '/home/sy0/git/netdisco-frontend-sandpit/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql':; + +BEGIN; + +ALTER TABLE node_ip ADD COLUMN dns text; + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql new file mode 100644 index 00000000..87c82876 --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-PostgreSQL.sql' to '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-PostgreSQL.sql':; + +BEGIN; + +ALTER TABLE node DROP CONSTRAINT node_pkey; + +COMMIT; + diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-PostgreSQL.sql similarity index 100% rename from Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-PostgreSQL.sql rename to Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-PostgreSQL.sql diff --git a/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql new file mode 100644 index 00000000..c3c71683 --- /dev/null +++ b/Netdisco/lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql @@ -0,0 +1,8 @@ +-- Convert schema '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-3-PostgreSQL.sql' to '/home/oliver/git/netdisco-frontend-sandpit/Netdisco/bin/../lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-4-PostgreSQL.sql':; + +BEGIN; + +ALTER TABLE node_wireless DROP CONSTRAINT node_wireless_pkey; + +COMMIT; + diff --git a/TODO b/TODO index 5275c5de..6349ede7 100644 --- a/TODO +++ b/TODO @@ -22,7 +22,6 @@ DAEMON CORE ==== -* deploy with individual SQL statements * pseudo-device support * VRF support * docs notes