From 8bf63007dcffeab8d07ed1b77ee9231f8fbdfc02 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sat, 1 Dec 2012 22:12:12 +0000 Subject: [PATCH] no longer deploy FK constraints with DB schema as they upset legacy netdisco.pm --- Changes | 1 + .../Netdisco-DB-1-2-PostgreSQL.sql | 1 - .../Netdisco-DB-1-PostgreSQL.sql | 76 ++++++++++--------- .../Netdisco-DB-2-PostgreSQL.sql | 76 ++++++++++--------- 4 files changed, 79 insertions(+), 75 deletions(-) diff --git a/Changes b/Changes index f720e4dd..0f3252dc 100644 --- a/Changes +++ b/Changes @@ -8,6 +8,7 @@ * port cotrol user log check now looks for all actions * node search switchport link shows connected nodes again + * no longer deploy FK constraints with DB schema as they upset legacy netdisco.pm 0.7 - 2012-11-25 diff --git a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-2-PostgreSQL.sql b/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-2-PostgreSQL.sql index bc5481f5..41935c2f 100644 --- a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-2-PostgreSQL.sql +++ b/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-2-PostgreSQL.sql @@ -15,6 +15,5 @@ ALTER TABLE device_port_vlan ADD COLUMN vlantype text; ALTER TABLE node_ip ADD COLUMN dns text; - COMMIT; diff --git a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql b/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql index e839565e..e99b8cd7 100644 --- a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql +++ b/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-1-PostgreSQL.sql @@ -409,40 +409,42 @@ 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"); --- --- 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; - +-- 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/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql b/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql index b68828fc..0243a177 100644 --- a/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql +++ b/Netdisco/lib/Netdisco/DB/schema_versions/Netdisco-DB-2-PostgreSQL.sql @@ -423,40 +423,42 @@ 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"); --- --- 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; - +-- 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; +--