Commit 97f664fa authored by Eric Dieckman's avatar Eric Dieckman
Browse files

fix errors in initial database and dataload

parent 5f5a1fb2

src/migrations/scripts/20251023141300_InitialDatabase.sql

+7 −7
Original line number Diff line number Diff line
@@ -97,18 +97,18 @@ CREATE TABLE `pa_access_domains_pa_vsyses` ( 
  `pa_access_domain_id` bigint unsigned NOT NULL,

  `pa_vsys_id` bigint unsigned NOT NULL,

  `created_at` datetime NOT NULL DEFAULT (utc_timestamp()),

  PRIMARY KEY (`pa_access_domain_id`, `pa_vsys_id`)

  PRIMARY KEY (`pa_access_domain_id`, `pa_vsys_id`),

  CONSTRAINT `pa_access_domains_pa_vsyses_pa_accessdomains_FK` FOREIGN KEY (`pa_access_domain_id`) REFERENCES `pa_access_domains` (`pa_access_domain_id`),

  CONSTRAINT `pa_access_domains_pa_vsyses_pa_vsyses_FK` FOREIGN KEY (`pa_vsys_id`) REFERENCES `pa_vsyses` (`pa_vsys_id`),

  CONSTRAINT `pa_access_domains_pa_vsyses_pa_vsyses_FK` FOREIGN KEY (`pa_vsys_id`) REFERENCES `pa_vsyses` (`pa_vsys_id`)

) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;



CREATE TABLE `pa_access_domains_pa_firewalls` (

  `pa_access_domain_id` bigint unsigned NOT NULL,

  `pa_firewall_id` bigint unsigned NOT NULL,

  `created_at` datetime NOT NULL DEFAULT (utc_timestamp()),

  PRIMARY KEY (`pa_access_domain_id`, `pa_firewall_id`)

  CONSTRAINT `pa_access_domains_pa_firewalls_pa_firewalls_FK` FOREIGN KEY (`pa_access_domain_id`) REFERENCES `pa_access_domains` (`pa_access_domain_id`),

  CONSTRAINT `pa_access_domains_pa_firewalls_pa_firewalls_FK` FOREIGN KEY (`pa_firewall_id`) REFERENCES `pa_vsyses` (`pa_firewall_id`),

  PRIMARY KEY (`pa_access_domain_id`, `pa_firewall_id`),

  CONSTRAINT `pa_access_domains_pa_firewalls_pa_access_domains_FK` FOREIGN KEY (`pa_access_domain_id`) REFERENCES `pa_access_domains` (`pa_access_domain_id`),

  CONSTRAINT `pa_access_domains_pa_firewalls_pa_firewalls_FK` FOREIGN KEY (`pa_firewall_id`) REFERENCES `pa_firewalls` (`pa_firewall_id`)

) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;



CREATE TABLE `wn_groups` (
@@ -177,10 +177,10 @@ CREATE TABLE `pa_firewalls_vlans` ( 
  `pa_firewall_id` bigint unsigned NOT NULL,

  `pa_vsys_id` bigint unsigned DEFAULT NULL,

  `vlan_id` bigint unsigned NOT NULL,

  `pa_vsys_id_normalized` bigint unsigned GENERATED ALWAYS AS (IFNULL(pa_vsys_id,-1)) STORED,

  `pa_vsys_id_normalized` bigint unsigned GENERATED ALWAYS AS (IFNULL(pa_vsys_id,0)) STORED,

  `created_at` datetime NOT NULL DEFAULT (utc_timestamp()),

  PRIMARY KEY (`pa_firewall_vlan_id`),

  UNIQUE KEY pa_firewalls_vlans_UNIQ (pa_firewall_id, pa_vsys_id_normalized, vlan_id)

  UNIQUE KEY pa_firewalls_vlans_UNIQ (pa_firewall_id, pa_vsys_id_normalized, vlan_id),

  KEY `pa_firewalls_vlans_vlans_FK` (`vlan_id`),

  KEY `pa_firewalls_vlans_pa_vsyses_FK` (`pa_vsys_id`),

  KEY `pa_firewalls_vlans_pa_firewalls_FK` (`pa_firewall_id`),

src/migrations/scripts/20251027152500_InitialDataLoad.sql

+8 −9
Original line number Diff line number Diff line
@@ -30,14 +30,13 @@ INSERT INTO locations (location_id,name,descr,created_at,updated_at,notes) VALUE 


INSERT INTO locations_vlans (location_vlan_id,location_id,vlan_id,created_at) VALUES

	 (1,1,2,'2025-10-27 19:35:33'),

     (1,2,3,'2025-10-27 19:35:33'),

     (1,2,4,'2025-10-27 19:35:33'),

     (1,2,5,'2025-10-27 19:35:33'),

     (1,2,6,'2025-10-27 19:35:33'),

     (1,2,7,'2025-10-27 19:35:33'),

     (1,2,8,'2025-10-27 19:35:33'),

     (1,2,9,'2025-10-27 19:35:33'),

     (1,2,10,'2025-10-27 19:35:33');

     (2,2,3,'2025-10-27 19:35:33'),

     (3,2,4,'2025-10-27 19:35:33'),

     (4,2,5,'2025-10-27 19:35:33'),

     (5,2,6,'2025-10-27 19:35:33'),

     (6,2,7,'2025-10-27 19:35:33'),

     (7,2,8,'2025-10-27 19:35:33'),

     (8,2,9,'2025-10-27 19:35:33');



INSERT INTO subnets (subnet_id,cidr,gateway,netname,descr,created_at,updated_at,vlan_id,is_active) VALUES

	 (1,'144.92.122.0/24','144.92.122.1','AAE-LAN','Agricultural and Applied Economics','2025-10-27 19:33:24','2025-10-27 19:33:24',2,1),
@@ -79,7 +78,7 @@ INSERT INTO pa_access_domains_pa_firewalls (pa_access_domain_id, pa_firewall_id, 
    (1,2,'2025-10-27 19:40:41');



INSERT INTO pa_firewalls_vlans (pa_firewall_vlan_id,pa_firewall_id,pa_vsys_id,vlan_id,created_at) VALUES

	 (1,1,NULL,2,'2025-10-27 19:40:41'),

	 (1,1,1,2,'2025-10-27 19:40:41'),

     (2,1,NULL,3,'2025-10-27 19:40:41'),

     (3,1,NULL,4,'2025-10-27 19:40:41'),

     (4,1,NULL,5,'2025-10-27 19:40:41'),