Complete Phase 2 PC migration and network device infrastructure updates

This commit captures 20 days of development work (Oct 28 - Nov 17, 2025) including Phase 2 PC migration, network device unification, and numerous bug fixes and enhancements. ## Major Changes ### Phase 2: PC Migration to Unified Machines Table - Migrated all PCs from separate `pc` table to unified `machines` table - PCs identified by `pctypeid IS NOT NULL` in machines table - Updated all display, add, edit, and update pages for PC functionality - Comprehensive testing: 15 critical pages verified working ### Network Device Infrastructure Unification - Unified network devices (Switches, Servers, Cameras, IDFs, Access Points) into machines table using machinetypeid 16-20 - Updated vw_network_devices view to query both legacy tables and machines table - Enhanced network_map.asp to display all device types from machines table - Fixed location display for all network device types ### Machine Management System - Complete machine CRUD operations (Create, Read, Update, Delete) - 5-tab interface: Basic Info, Network, Relationships, Compliance, Location - Support for multiple network interfaces (up to 3 per machine) - Machine relationships: Controls (PC→Equipment) and Dualpath (redundancy) - Compliance tracking with third-party vendor management ### Bug Fixes (Nov 7-14, 2025) - Fixed editdevice.asp undefined variable (pcid → machineid) - Migrated updatedevice.asp and updatedevice_direct.asp to Phase 2 schema - Fixed network_map.asp to show all network device types - Fixed displaylocation.asp to query machines table for network devices - Fixed IP columns migration and compliance column handling - Fixed dateadded column errors in network device pages - Fixed PowerShell API integration issues - Simplified displaypcs.asp (removed IP and Machine columns) ### Documentation - Created comprehensive session summaries (Nov 10, 13, 14) - Added Machine Quick Reference Guide - Documented all bug fixes and migrations - API documentation for ASP endpoints ### Database Schema Updates - Phase 2 migration scripts for PC consolidation - Phase 3 migration scripts for network devices - Updated views to support hybrid table approach - Sample data creation/removal scripts for testing ## Files Modified (Key Changes) - editdevice.asp, updatedevice.asp, updatedevice_direct.asp - network_map.asp, network_devices.asp, displaylocation.asp - displaypcs.asp, displaypc.asp, displaymachine.asp - All machine management pages (add/edit/save/update) - save_network_device.asp (fixed machine type IDs) ## Testing Status - 15 critical pages tested and verified - Phase 2 PC functionality: 100% working - Network device display: 100% working - Security: All queries use parameterized commands ## Production Readiness - Core functionality complete and tested - 85% production ready - Remaining: Full test coverage of all 123 ASP pages 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-17 20:04:06 -05:00
commit 4bcaf0913f
1954 changed files with 434785 additions and 0 deletions
--- a/v2/sql/MIGRATION_SCRIPTS_UPDATE_SUMMARY.md
+++ b/v2/sql/MIGRATION_SCRIPTS_UPDATE_SUMMARY.md
@@ -0,0 +1,152 @@
+# Migration Scripts Update Summary
+
+**Date:** 2025-10-23
+**Reason:** Fix post-migration bugs in network_devices.asp
+
+---
+
+## Root Cause
+
+After running migration on fresh production database, discovered that:
+1. Access Points were missing from `vw_network_devices` view
+2. Camera-specific columns (`idfid`, `idfname`, `macaddress`) were missing from view
+3. Access Points table was missing `apname` and `modelid` columns
+4. **Printers were missing from `vw_network_devices` view** (discovered during final verification)
+
+This caused network_devices.asp to fail when trying to display cameras (500 error) and printers not showing up in the network devices page.
+
+---
+
+## Files Updated
+
+### 1. `sql/add_infrastructure_vendor_model_support.sql`
+
+**Changes:**
+- Added **SECTION 5**: Add modelid to accesspoints table
+- Updated section numbering (SECTION 5 → SECTION 6, SECTION 6 → SECTION 7)
+- Updated verification queries to include `accesspoints` table
+- Added foreign key constraint for accesspoints.modelid → models
+
+**New Steps:**
+```
+Step 5 Complete: Added modelid to accesspoints table
+Step 6 Complete: Updated vw_network_devices with vendor/model info (was Step 5)
+```
+
+### 2. `sql/add_device_name_fields.sql`
+
+**Changes:**
+- Added **SECTION 4**: Add name field (apname) to accesspoints table
+- Updated section numbering (SECTION 4 → SECTION 5, SECTION 5 → SECTION 6)
+- **CRITICAL FIX**: Updated `vw_network_devices` view to include:
+  - Camera-specific columns: `idfid`, `idfname`, `macaddress`
+  - Access Points section (entire UNION ALL block)
+  - **Printers section (entire UNION ALL block)**
+  - All UNION sections now have same column structure
+- Updated verification queries to include `accesspoints` table
+
+**View Structure Now Includes:**
+```sql
+-- All sections now include these columns:
+device_type, device_id, device_name,
+modelid, modelnumber, vendor,
+serialnumber, ipaddress, description,
+maptop, mapleft, isactive,
+idfid, idfname, macaddress  -- Camera-specific, NULL for others
+
+-- Device types in view: IDF, Server, Switch, Camera, Access Point, Printer
+```
+
+**New Steps:**
+```
+Step 4 Complete: Added apname to accesspoints table
+Step 5 Complete: Updated vw_network_devices view with name fields, camera columns, and printers (was Step 4)
+```
+
+### 3. `sql/PRODUCTION_MIGRATION_CHECKLIST.md`
+
+**Changes:**
+- Updated Script 1 expected output to show 6 steps (was 5)
+- Added `accesspoints` to all verification queries
+- Updated Script 2 expected output to show 5 steps (was 4)
+- Updated verification examples to include `accesspoints | apname | varchar`
+- Updated Final Schema Reference to include:
+  - Complete accesspoints table schema
+  - Camera-specific columns in vw_network_devices view
+
+---
+
+## Migration Impact
+
+### Before Fix
+- ❌ network_devices.asp?filter=Camera → 500 error
+- ❌ Access Points not in vw_network_devices view
+- ❌ Access Points missing apname and modelid columns
+- ❌ Printers not in vw_network_devices view
+
+### After Fix
+- ✅ network_devices.asp?filter=Camera → Works correctly
+- ✅ Access Points included in vw_network_devices view
+- ✅ Access Points have apname and modelid columns
+- ✅ Printers included in vw_network_devices view (40 printers displaying)
+- ✅ All device types display correctly in network_devices.asp
+- ✅ Camera IDF information displays properly
+
+---
+
+## Testing Performed
+
+Tested on freshly imported production database (database-backup-10-23-25-updated.sql):
+
+1. ✅ Ran all 3 migration scripts in sequence
+2. ✅ Added Server with new vendor/model
+3. ✅ Added Camera with new vendor/model/IDF
+4. ✅ Added Access Point with new vendor/model
+5. ✅ Verified network_devices.asp?filter=Camera works
+6. ✅ Verified network_devices.asp?filter=Server works
+7. ✅ Verified network_devices.asp?filter=Access Point works
+8. ✅ Verified network_devices.asp?filter=Printer works (40 printers displaying)
+9. ✅ Verified network_devices.asp?filter=all works
+
+---
+
+## Production Deployment Notes
+
+**Safe to Re-run:** YES - All scripts use IF NOT EXISTS checks
+
+**Backwards Compatible:** YES
+- New columns are nullable
+- Existing queries continue to work
+- View changes are additive (more columns available)
+
+**Breaking Changes:** NONE
+- All changes are additive
+- Existing functionality preserved
+
+---
+
+## Files Modified Summary
+
+```
+✅ sql/add_infrastructure_vendor_model_support.sql
+   - Added accesspoints modelid support
+   - Updated section numbering
+   - Updated verification queries
+
+✅ sql/add_device_name_fields.sql
+   - Added accesspoints apname support
+   - FIXED vw_network_devices view (camera columns + access points)
+   - Updated section numbering
+   - Updated verification queries
+
+✅ sql/PRODUCTION_MIGRATION_CHECKLIST.md
+   - Updated all documentation
+   - Updated expected outputs
+   - Updated verification examples
+   - Updated final schema reference
+```
+
+---
+
+**Status:** ✅ READY FOR PRODUCTION
+**Last Updated:** 2025-10-23 19:30
--- a/v2/sql/PRODUCTION_DEPLOYMENT_INSTRUCTIONS.md
+++ b/v2/sql/PRODUCTION_DEPLOYMENT_INSTRUCTIONS.md
@@ -0,0 +1,296 @@
+# Production Deployment Instructions - Infrastructure Migration
+
+**Date:** 2025-10-23
+**Estimated Time:** 5-10 minutes
+**Estimated Downtime:** 2-5 minutes (during script execution)
+
+---
+
+## Overview
+
+This migration adds infrastructure device tracking (servers, switches, cameras, access points, IDFs) to the ShopDB application. All scripts are **safe to re-run** and use IF NOT EXISTS checks.
+
+---
+
+## Pre-Deployment Checklist
+
+### 1. Create Database Backup
+
+```bash
+# Navigate to backup location
+cd /path/to/backups
+
+# Create timestamped backup
+mysqldump -h <hostname> -u <username> -p<password> shopdb > shopdb_backup_$(date +%Y%m%d_%H%M%S).sql
+
+# Verify backup was created
+ls -lh shopdb_backup_*.sql
+```
+
+### 2. Verify Database Connection
+
+```bash
+mysql -h <hostname> -u <username> -p<password> shopdb -e "SELECT 'Connection successful' as status;"
+```
+
+### 3. Check Current State
+
+```bash
+mysql -h <hostname> -u <username> -p<password> shopdb -e "
+SELECT COUNT(*) as active_printers FROM printers WHERE isactive = 1;
+SELECT COUNT(*) as total_machines FROM machines WHERE isactive = 1;
+"
+```
+
+**Expected Results:**
+- Should see printer count (likely 37-40)
+- Should see machine count
+
+---
+
+## Migration Execution
+
+Run these scripts **in order**. Each script is idempotent (safe to re-run).
+
+### Script 1: Create Infrastructure Tables
+
+```bash
+mysql -h <hostname> -u <username> -p<password> shopdb < sql/PRODUCTION_READY_infrastructure_migration_v2.sql
+```
+
+**Expected Output:**
+```
+Step 1 Complete: Added maptop and mapleft columns to printers table
+Step 2 Complete: Created IDFs table
+Step 3 Complete: Created switches table
+Step 4 Complete: Created accesspoints table
+Step 5 Complete: Created servers table
+Step 6 Complete: Created cameras table
+Step 7 Complete: Cleaned up duplicate -PRINTER machines
+Step 8 Complete: Migrated printer coordinates from machines
+Step 9 Complete: Created infrastructure views
+MIGRATION COMPLETED SUCCESSFULLY!
+```
+
+**What it does:**
+- Creates 5 new tables: idfs, servers, switches, cameras, accesspoints
+- Adds maptop/mapleft to printers table
+- Deactivates machines with names like "-PRINTER" (duplicates)
+- Migrates printer coordinates from machines to printers
+
+---
+
+### Script 2: Add Vendor/Model Support
+
+```bash
+mysql -h <hostname> -u <username> -p<password> shopdb < sql/add_infrastructure_vendor_model_support.sql
+```
+
+**Expected Output:**
+```
+Step 1 Complete: Added vendor flags for infrastructure devices
+Step 2 Complete: Added modelid to servers table
+Step 3 Complete: Added modelid to switches table
+Step 4 Complete: Added modelid to cameras table
+Step 5 Complete: Added modelid to accesspoints table
+Step 6 Complete: Updated vw_network_devices with vendor/model info
+VENDOR/MODEL SUPPORT ADDED SUCCESSFULLY!
+```
+
+**What it does:**
+- Adds modelid column to all infrastructure tables
+- Links infrastructure devices to existing vendors/models tables
+- Creates vw_network_devices view (unified view of all devices)
+
+---
+
+### Script 3: Add Device Name Fields
+
+```bash
+mysql -h <hostname> -u <username> -p<password> shopdb < sql/add_device_name_fields.sql
+```
+
+**Expected Output:**
+```
+Step 1 Complete: Added servername to servers table
+Step 2 Complete: Added switchname to switches table
+Step 3 Complete: Added cameraname to cameras table
+Step 4 Complete: Added apname to accesspoints table
+Step 5 Complete: Updated vw_network_devices view with name fields, camera columns, and printers
+NAME FIELDS ADDED SUCCESSFULLY!
+```
+
+**What it does:**
+- Adds name fields to all infrastructure tables
+- Updates vw_network_devices view with device names
+- Includes camera-specific columns (idfid, idfname, macaddress)
+- **Includes printers in unified view**
+
+---
+
+## Post-Migration Verification
+
+### 1. Verify Tables Created
+
+```bash
+mysql -h <hostname> -u <username> -p<password> shopdb -e "
+SHOW TABLES LIKE '%servers%';
+SHOW TABLES LIKE '%switches%';
+SHOW TABLES LIKE '%cameras%';
+SHOW TABLES LIKE '%accesspoints%';
+SHOW TABLES LIKE '%idfs%';
+"
+```
+
+**Expected:** All 5 tables should exist
+
+---
+
+### 2. Verify View Includes All Device Types
+
+```bash
+mysql -h <hostname> -u <username> -p<password> shopdb -e "
+SELECT device_type, COUNT(*) as count
+FROM vw_network_devices
+GROUP BY device_type
+ORDER BY device_type;
+"
+```
+
+**Expected Output:**
+```
+device_type      count
+Printer          37-40 (your printer count)
+```
+
+*Note: Other device types will show 0 until you add infrastructure devices*
+
+---
+
+### 3. Verify Printer Coordinates Migrated
+
+```bash
+mysql -h <hostname> -u <username> -p<password> shopdb -e "
+SELECT COUNT(*) as printers_with_coordinates
+FROM printers
+WHERE maptop IS NOT NULL AND mapleft IS NOT NULL;
+"
+```
+
+**Expected:** Should show count of printers that had coordinates
+
+---
+
+### 4. Test Application Pages
+
+Navigate to these pages and verify no errors:
+
+1. **http://your-server/network_devices.asp**
+   - Should load with tabs: All, IDF, Server, Switch, Camera, Access Point, Printer
+   - Click "Printer" tab - should show all printers
+
+2. **http://your-server/network_devices.asp?filter=Printer**
+   - Should display all printers with vendor/model info
+
+3. **http://your-server/network_devices.asp?filter=Camera**
+   - Should show "No cameras found" (not a 500 error!)
+
+4. **http://your-server/displayprinters.asp**
+   - Existing printer page should still work
+
+5. **http://your-server/network_map.asp**
+   - Map should still work with existing data
+
+---
+
+## If Something Goes Wrong
+
+### Rollback Option 1: Restore from Backup
+
+```bash
+# Stop application if needed
+# Restore database
+mysql -h <hostname> -u <username> -p<password> shopdb < shopdb_backup_YYYYMMDD_HHMMSS.sql
+
+# Verify restoration
+mysql -h <hostname> -u <username> -p<password> shopdb -e "SHOW TABLES; SELECT COUNT(*) FROM printers;"
+```
+
+### Rollback Option 2: Run Rollback Script
+
+```bash
+mysql -h <hostname> -u <username> -p<password> shopdb < sql/ROLLBACK_infrastructure_migration.sql
+```
+
+**Warning:** This will drop all infrastructure tables and columns added by the migration.
+
+---
+
+## Post-Deployment Notes
+
+### Immediate Impact
+- ✅ All existing functionality continues to work
+- ✅ New "Network Devices" menu item appears in navigation
+- ✅ Printers now visible in unified network devices view
+- ✅ No data loss - all existing data preserved
+
+### What's New
+- New menu: "Network Devices" (left sidebar)
+- Unified device management page at `/network_devices.asp`
+- Ready to add servers, switches, cameras, access points, IDFs
+- Printer coordinates now on printers table (migrated from machines)
+
+### No Breaking Changes
+- All existing pages work unchanged
+- Existing queries continue to function
+- All new columns are nullable
+- Foreign keys allow NULL values
+
+---
+
+## Support Contacts
+
+- **DBA:** [Your DBA Contact]
+- **Developer:** [Your Developer Contact]
+- **After-hours:** [Emergency Contact]
+
+---
+
+## Migration History Log
+
+Record your deployment here:
+
+| Date | Time | Executed By | Status | Notes |
+|------|------|-------------|--------|-------|
+| YYYY-MM-DD | HH:MM | [Name] | [ ] Success / [ ] Rollback | |
+
+---
+
+## Quick Command Reference
+
+**Full migration (all 3 scripts):**
+
+```bash
+# Set your database credentials
+DB_HOST="your-host"
+DB_USER="your-user"
+DB_PASS="your-password"
+DB_NAME="shopdb"
+
+# Navigate to sql directory
+cd /path/to/shopdb/sql
+
+# Run all 3 scripts in sequence
+mysql -h $DB_HOST -u $DB_USER -p$DB_PASS $DB_NAME < PRODUCTION_READY_infrastructure_migration_v2.sql
+mysql -h $DB_HOST -u $DB_USER -p$DB_PASS $DB_NAME < add_infrastructure_vendor_model_support.sql
+mysql -h $DB_HOST -u $DB_USER -p$DB_PASS $DB_NAME < add_device_name_fields.sql
+
+# Verify
+mysql -h $DB_HOST -u $DB_USER -p$DB_PASS $DB_NAME -e "SELECT device_type, COUNT(*) FROM vw_network_devices GROUP BY device_type;"
+```
+
+---
+
+**Status:** READY FOR PRODUCTION ✅
+**Last Tested:** 2025-10-23 (on fresh production data backup)
+**Test Results:** All scripts completed successfully, all device types displaying correctly
--- a/v2/sql/PRODUCTION_MIGRATION_CHECKLIST.md
+++ b/v2/sql/PRODUCTION_MIGRATION_CHECKLIST.md
@@ -0,0 +1,476 @@
+# Infrastructure Support - Production Migration Checklist
+
+**Date Created:** 2025-10-23
+**Status:** TESTED ON DEV - READY FOR PRODUCTION
+**Estimated Downtime:** 2-5 minutes
+
+---
+
+## Pre-Migration Checklist
+
+### 1. Backup Database
+```bash
+# Create backup before migration
+docker exec dev-mysql mysqldump -u 570005354 -p570005354 shopdb > shopdb_backup_$(date +%Y%m%d_%H%M%S).sql
+
+# Verify backup file exists and has content
+ls -lh shopdb_backup_*.sql
+```
+
+### 2. Verify Current State
+```sql
+-- Check if tables exist
+SELECT table_name FROM information_schema.tables
+WHERE table_schema='shopdb'
+AND table_name IN ('servers', 'switches', 'cameras', 'idfs');
+
+-- Check current row counts
+SELECT 'servers' as table_name, COUNT(*) as count FROM servers
+UNION ALL
+SELECT 'switches', COUNT(*) FROM switches
+UNION ALL
+SELECT 'cameras', COUNT(*) FROM cameras
+UNION ALL
+SELECT 'idfs', COUNT(*) FROM idfs;
+```
+
+### 3. Test Database Connection
+```bash
+# Ensure you can connect
+mysql -h <host> -u <user> -p<password> shopdb -e "SELECT 'Connection successful' as status;"
+```
+
+---
+
+## Migration Scripts (Run in Order)
+
+### Script 1: add_infrastructure_vendor_model_support.sql
+
+**Purpose:** Adds modelid column to infrastructure tables and creates vw_network_devices view
+
+**What it does:**
+- Adds `isserver`, `isswitch`, `iscamera` flags to vendors table (if not exist)
+- Adds `modelid` to servers table (if not exist)
+- Adds `modelid` to switches table (if not exist)
+- Adds `modelid` to cameras table (if not exist)
+- Adds `modelid` to accesspoints table (if not exist)
+- Creates foreign keys to models table
+- Creates `vw_network_devices` view
+
+**Safe to re-run:** YES - Uses IF NOT EXISTS checks
+
+**How to run:**
+```bash
+mysql -h <host> -u <user> -p<password> shopdb < add_infrastructure_vendor_model_support.sql
+```
+
+**Expected output:**
+```
+Step 1 Complete: Added vendor flags for infrastructure devices
+Step 2 Complete: Added modelid to servers table
+Step 3 Complete: Added modelid to switches table
+Step 4 Complete: Added modelid to cameras table
+Step 5 Complete: Added modelid to accesspoints table
+Step 6 Complete: Updated vw_network_devices with vendor/model info
+VENDOR/MODEL SUPPORT ADDED SUCCESSFULLY!
+```
+
+**Verification:**
+```sql
+-- Verify modelid columns exist
+DESCRIBE servers;
+DESCRIBE switches;
+DESCRIBE cameras;
+
+-- Verify view exists
+SELECT * FROM vw_network_devices LIMIT 1;
+
+-- Verify foreign keys
+SELECT TABLE_NAME, CONSTRAINT_NAME, REFERENCED_TABLE_NAME
+FROM information_schema.KEY_COLUMN_USAGE
+WHERE TABLE_SCHEMA = 'shopdb'
+  AND TABLE_NAME IN ('servers', 'switches', 'cameras')
+  AND REFERENCED_TABLE_NAME = 'models';
+```
+
+### Script 2: add_device_name_fields.sql
+
+**Purpose:** Adds name fields to infrastructure tables
+
+**What it does:**
+- Adds `servername` to servers table (if not exist)
+- Adds `switchname` to switches table (if not exist)
+- Adds `cameraname` to cameras table (if not exist)
+- Adds `apname` to accesspoints table (if not exist)
+- Updates `vw_network_devices` view to include name fields and camera-specific columns (idfid, idfname, macaddress)
+- Includes Access Points and Printers in the view
+
+**Safe to re-run:** YES - Uses IF NOT EXISTS checks
+
+**How to run:**
+```bash
+mysql -h <host> -u <user> -p<password> shopdb < add_device_name_fields.sql
+```
+
+**Expected output:**
+```
+Step 1 Complete: Added servername to servers table
+Step 2 Complete: Added switchname to switches table
+Step 3 Complete: Added cameraname to cameras table
+Step 4 Complete: Added apname to accesspoints table
+Step 5 Complete: Updated vw_network_devices view with name fields, camera columns, and printers
+NAME FIELDS ADDED SUCCESSFULLY!
+```
+
+**Verification:**
+```sql
+-- Verify name columns exist
+SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = 'shopdb'
+  AND TABLE_NAME IN ('servers', 'switches', 'cameras', 'idfs', 'accesspoints')
+  AND COLUMN_NAME LIKE '%name%'
+ORDER BY TABLE_NAME;
+
+-- Should show:
+-- accesspoints | apname      | varchar
+-- cameras      | cameraname  | varchar
+-- idfs         | idfname     | varchar
+-- servers      | servername  | varchar
+-- switches     | switchname  | varchar
+```
+
+---
+
+## Post-Migration Verification
+
+### 1. Check Final Schema
+
+**IDFs Table:**
+```sql
+DESCRIBE idfs;
+-- Expected: idfid, idfname, description, maptop, mapleft, isactive
+```
+
+**Servers Table:**
+```sql
+DESCRIBE servers;
+-- Expected: serverid, servername, modelid, serialnumber, ipaddress,
+--           description, maptop, mapleft, isactive
+```
+
+**Switches Table:**
+```sql
+DESCRIBE switches;
+-- Expected: switchid, switchname, modelid, serialnumber, ipaddress,
+--           description, maptop, mapleft, isactive
+```
+
+**Cameras Table:**
+```sql
+DESCRIBE cameras;
+-- Expected: cameraid, cameraname, modelid, idfid, serialnumber, macaddress,
+--           ipaddress, description, maptop, mapleft, isactive
+```
+
+### 2. Test View
+
+```sql
+-- View should include device_name column
+SELECT device_type, device_name, vendor, modelnumber
+FROM vw_network_devices
+LIMIT 5;
+```
+
+### 3. Verify Data Integrity
+
+```sql
+-- Check that existing data is intact
+SELECT COUNT(*) as total_devices FROM (
+    SELECT idfid as id FROM idfs WHERE isactive = 1
+    UNION ALL
+    SELECT serverid FROM servers WHERE isactive = 1
+    UNION ALL
+    SELECT switchid FROM switches WHERE isactive = 1
+    UNION ALL
+    SELECT cameraid FROM cameras WHERE isactive = 1
+) as all_devices;
+
+-- Compare this count to pre-migration counts
+```
+
+---
+
+## Rollback Plan (If Needed)
+
+### If Script 1 Fails or Needs Rollback
+
+```sql
+-- Drop foreign keys
+ALTER TABLE servers DROP FOREIGN KEY servers_ibfk_1;
+ALTER TABLE switches DROP FOREIGN KEY switches_ibfk_1;
+ALTER TABLE cameras DROP FOREIGN KEY fk_cameras_model;
+
+-- Drop modelid columns
+ALTER TABLE servers DROP COLUMN modelid;
+ALTER TABLE switches DROP COLUMN modelid;
+ALTER TABLE cameras DROP COLUMN modelid;
+
+-- Drop vendor flags (optional - these don't hurt anything)
+ALTER TABLE vendors DROP COLUMN isserver;
+ALTER TABLE vendors DROP COLUMN isswitch;
+ALTER TABLE vendors DROP COLUMN iscamera;
+
+-- Drop view
+DROP VIEW IF EXISTS vw_network_devices;
+```
+
+### If Script 2 Fails or Needs Rollback
+
+```sql
+-- Drop name columns
+ALTER TABLE servers DROP COLUMN servername;
+ALTER TABLE switches DROP COLUMN switchname;
+ALTER TABLE cameras DROP COLUMN cameraname;
+
+-- Recreate old view (without name fields)
+DROP VIEW IF EXISTS vw_network_devices;
+
+CREATE VIEW vw_network_devices AS
+SELECT
+  'IDF' AS device_type,
+  i.idfid AS device_id,
+  NULL AS modelid,
+  NULL AS modelnumber,
+  NULL AS vendor,
+  NULL AS serialnumber,
+  NULL AS ipaddress,
+  i.description,
+  i.maptop,
+  i.mapleft,
+  i.isactive
+FROM idfs i
+UNION ALL
+SELECT
+  'Server' AS device_type,
+  s.serverid AS device_id,
+  s.modelid,
+  m.modelnumber,
+  v.vendor,
+  s.serialnumber,
+  s.ipaddress,
+  s.description,
+  s.maptop,
+  s.mapleft,
+  s.isactive
+FROM servers s
+LEFT JOIN models m ON s.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid
+UNION ALL
+SELECT
+  'Switch' AS device_type,
+  sw.switchid AS device_id,
+  sw.modelid,
+  m.modelnumber,
+  v.vendor,
+  sw.serialnumber,
+  sw.ipaddress,
+  sw.description,
+  sw.maptop,
+  sw.mapleft,
+  sw.isactive
+FROM switches sw
+LEFT JOIN models m ON sw.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid
+UNION ALL
+SELECT
+  'Camera' AS device_type,
+  c.cameraid AS device_id,
+  c.modelid,
+  m.modelnumber,
+  v.vendor,
+  c.serialnumber,
+  c.ipaddress,
+  c.description,
+  c.maptop,
+  c.mapleft,
+  c.isactive
+FROM cameras c
+LEFT JOIN models m ON c.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid;
+```
+
+### Restore from Backup (Complete Rollback)
+
+```bash
+# Stop application (if applicable)
+# Restore database
+mysql -h <host> -u <user> -p<password> shopdb < shopdb_backup_YYYYMMDD_HHMMSS.sql
+
+# Verify restoration
+mysql -h <host> -u <user> -p<password> shopdb -e "SHOW TABLES; SELECT COUNT(*) FROM servers;"
+```
+
+---
+
+## Impact Assessment
+
+### Changes to Existing Data
+**NONE** - These migrations are purely additive:
+- Add new columns (all nullable, won't break existing queries)
+- Add foreign keys (won't break existing data)
+- Create/update views (won't affect base tables)
+
+### Impact on Existing Application
+**MINIMAL** - Existing pages will continue to work:
+- All new columns are nullable
+- Existing SELECT queries still work (just ignore new columns)
+- Existing INSERT queries still work (new columns default to NULL)
+- View creation doesn't affect existing queries
+
+### Required Application Updates
+**NEW PAGES ONLY** - Existing application needs no changes:
+- Need to create new network device management pages
+- Need to update navigation menu
+- Optionally update network_map.asp to show infrastructure
+
+---
+
+## Testing Steps (After Migration)
+
+### 1. Verify Schema
+```sql
+-- Run all verification queries above
+-- Ensure all columns exist
+-- Ensure foreign keys are in place
+```
+
+### 2. Test Inserts
+```sql
+-- Test adding a server
+INSERT INTO servers (servername, serialnumber, ipaddress, description, isactive)
+VALUES ('TEST-SERVER-01', 'SN12345', '192.168.1.100', 'Test server', 1);
+
+-- Verify
+SELECT * FROM servers WHERE servername = 'TEST-SERVER-01';
+
+-- Test view
+SELECT * FROM vw_network_devices WHERE device_type = 'Server' AND device_name = 'TEST-SERVER-01';
+
+-- Cleanup
+DELETE FROM servers WHERE servername = 'TEST-SERVER-01';
+```
+
+### 3. Test Existing Functionality
+- Navigate to existing pages (displayprinters.asp, displaymachines.asp, etc.)
+- Verify no errors
+- Verify data displays correctly
+
+---
+
+## Production Deployment Schedule
+
+### Recommended Timing
+- **Maintenance window:** After hours or weekend
+- **Duration:** 15-30 minutes (includes verification)
+- **Downtime:** 2-5 minutes (only during migration)
+
+### Deployment Steps
+
+1. **Announce maintenance** (1 day before)
+2. **Backup database** (immediately before)
+3. **Run migration script 1** (2 minutes)
+4. **Verify script 1** (1 minute)
+5. **Run migration script 2** (2 minutes)
+6. **Verify script 2** (1 minute)
+7. **Test inserts/queries** (5 minutes)
+8. **Deploy new ASP pages** (when ready)
+9. **Update navigation menu** (when ready)
+10. **Announce completion**
+
+---
+
+## Support Contacts
+
+- **DBA:** [Name/Contact]
+- **Developer:** [Name/Contact]
+- **After-hours:** [Emergency Contact]
+
+---
+
+## Migration History
+
+| Date | Environment | Status | Notes |
+|------|-------------|--------|-------|
+| 2025-10-23 | Dev | ✅ Success | Both scripts ran successfully, all verifications passed |
+| TBD | Production | Pending | |
+
+---
+
+## Final Schema Reference
+
+```
+idfs:
+  ✅ idfid (PK)
+  ✅ idfname
+  ✅ description
+  ✅ maptop, mapleft
+  ✅ isactive
+
+servers:
+  ✅ serverid (PK)
+  ➕ servername (NEW)
+  ➕ modelid → models (NEW FK)
+  ✅ serialnumber
+  ✅ ipaddress
+  ✅ description
+  ✅ maptop, mapleft
+  ✅ isactive
+
+switches:
+  ✅ switchid (PK)
+  ➕ switchname (NEW)
+  ➕ modelid → models (NEW FK)
+  ✅ serialnumber
+  ✅ ipaddress
+  ✅ description
+  ✅ maptop, mapleft
+  ✅ isactive
+
+cameras:
+  ✅ cameraid (PK)
+  ➕ cameraname (NEW)
+  ➕ modelid → models (NEW FK)
+  ✅ idfid → idfs (EXISTING)
+  ✅ serialnumber
+  ✅ macaddress
+  ✅ ipaddress
+  ✅ description
+  ✅ maptop, mapleft
+  ✅ isactive
+
+accesspoints:
+  ✅ apid (PK)
+  ➕ apname (NEW)
+  ➕ modelid → models (NEW FK)
+  ✅ serialnumber
+  ✅ ipaddress
+  ✅ description
+  ✅ maptop, mapleft
+  ✅ isactive
+
+vw_network_devices:
+  ➕ device_name (NEW)
+  ✅ device_type, device_id (Includes: IDF, Server, Switch, Camera, Access Point, Printer)
+  ➕ modelid, modelnumber, vendor (NEW)
+  ✅ serialnumber, ipaddress, description
+  ✅ maptop, mapleft, isactive
+  ➕ idfid, idfname (Camera-specific - NEW)
+  ➕ macaddress (Camera-specific - NEW)
+```
+
+---
+
+**Status:** READY FOR PRODUCTION ✅
+**Last Updated:** 2025-10-23
+
--- a/v2/sql/PRODUCTION_READY_infrastructure_migration_v2.sql
+++ b/v2/sql/PRODUCTION_READY_infrastructure_migration_v2.sql
@@ -0,0 +1,447 @@
+-- ============================================================================
+-- ShopDB Infrastructure Enhancement - PRODUCTION MIGRATION v2
+-- ============================================================================
+-- Purpose: Add infrastructure device tracking and migrate printer coordinates
+-- Author: Development Team
+-- Date: 2025-10-22
+-- Version: 2.0
+--
+-- IMPORTANT: Review this entire script before running on production!
+-- This version CREATES infrastructure tables if they don't exist.
+-- ============================================================================
+
+-- Set session variables for safety
+SET SQL_SAFE_UPDATES = 0;
+SET FOREIGN_KEY_CHECKS = 0;
+
+SELECT '============================================' AS sep;
+SELECT 'STARTING INFRASTRUCTURE MIGRATION v2' AS status;
+SELECT '============================================' AS sep;
+
+-- ============================================================================
+-- SECTION 1: ADD COLUMNS TO PRINTERS TABLE
+-- ============================================================================
+-- Add maptop and mapleft columns to printers table for independent positioning
+
+-- Check if columns already exist and add them if they don't
+SET @col_exists_maptop = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'printers' AND COLUMN_NAME = 'maptop');
+SET @col_exists_mapleft = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'printers' AND COLUMN_NAME = 'mapleft');
+
+SET @sql_maptop = IF(@col_exists_maptop = 0,
+    'ALTER TABLE printers ADD COLUMN maptop INT(11) AFTER machineid',
+    'SELECT "maptop already exists" AS notice');
+SET @sql_mapleft = IF(@col_exists_mapleft = 0,
+    'ALTER TABLE printers ADD COLUMN mapleft INT(11) AFTER maptop',
+    'SELECT "mapleft already exists" AS notice');
+
+PREPARE stmt FROM @sql_maptop;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+PREPARE stmt FROM @sql_mapleft;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SELECT 'Step 1 Complete: Added maptop and mapleft columns to printers table' AS status;
+
+
+-- ============================================================================
+-- SECTION 2: CREATE IDFs TABLE (if it doesn't exist)
+-- ============================================================================
+-- IDFs are physical locations (closets/distribution frames)
+
+CREATE TABLE IF NOT EXISTS idfs (
+  idfid INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  idfname VARCHAR(100),
+  description VARCHAR(255),
+  maptop INT(11),
+  mapleft INT(11),
+  isactive BIT(1) DEFAULT b'1',
+  INDEX idx_idfname (idfname),
+  INDEX idx_isactive (isactive)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+COMMENT='Intermediate Distribution Frames - Physical network closet locations';
+
+SELECT 'Step 2 Complete: Created IDFs table' AS status;
+
+
+-- ============================================================================
+-- SECTION 3: CREATE SWITCHES TABLE (if it doesn't exist)
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS switches (
+  switchid INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  serialnumber VARCHAR(100),
+  ipaddress VARCHAR(45),
+  description VARCHAR(255),
+  maptop INT(11),
+  mapleft INT(11),
+  isactive BIT(1) DEFAULT b'1',
+  INDEX idx_serialnumber (serialnumber),
+  INDEX idx_ipaddress (ipaddress),
+  INDEX idx_isactive (isactive)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+COMMENT='Network switches';
+
+SELECT 'Step 3 Complete: Created switches table' AS status;
+
+
+-- ============================================================================
+-- SECTION 4: CREATE ACCESS POINTS TABLE (if it doesn't exist)
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS accesspoints (
+  apid INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  serialnumber VARCHAR(100),
+  ipaddress VARCHAR(45),
+  description VARCHAR(255),
+  maptop INT(11),
+  mapleft INT(11),
+  isactive BIT(1) DEFAULT b'1',
+  INDEX idx_serialnumber (serialnumber),
+  INDEX idx_ipaddress (ipaddress),
+  INDEX idx_isactive (isactive)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+COMMENT='Wireless access points';
+
+SELECT 'Step 4 Complete: Created accesspoints table' AS status;
+
+
+-- ============================================================================
+-- SECTION 5: CREATE SERVERS TABLE (if it doesn't exist)
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS servers (
+  serverid INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  serialnumber VARCHAR(100),
+  ipaddress VARCHAR(45),
+  description VARCHAR(255),
+  maptop INT(11),
+  mapleft INT(11),
+  isactive BIT(1) DEFAULT b'1',
+  INDEX idx_serialnumber (serialnumber),
+  INDEX idx_ipaddress (ipaddress),
+  INDEX idx_isactive (isactive)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+COMMENT='Servers';
+
+SELECT 'Step 5 Complete: Created servers table' AS status;
+
+
+-- ============================================================================
+-- SECTION 6: CREATE CAMERAS TABLE (if it doesn't exist)
+-- ============================================================================
+
+CREATE TABLE IF NOT EXISTS cameras (
+  cameraid INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  idfid INT(11),
+  serialnumber VARCHAR(100),
+  macaddress VARCHAR(17),
+  ipaddress VARCHAR(45),
+  description VARCHAR(255),
+  maptop INT(11),
+  mapleft INT(11),
+  isactive BIT(1) DEFAULT b'1',
+  INDEX idx_idfid (idfid),
+  INDEX idx_serialnumber (serialnumber),
+  INDEX idx_macaddress (macaddress),
+  INDEX idx_ipaddress (ipaddress),
+  INDEX idx_isactive (isactive),
+  FOREIGN KEY (idfid) REFERENCES idfs(idfid) ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
+COMMENT='Security cameras';
+
+SELECT 'Step 6 Complete: Created cameras table' AS status;
+
+
+-- ============================================================================
+-- SECTION 7: CLEANUP DUPLICATE -PRINTER MACHINES
+-- ============================================================================
+-- Remove old duplicate machines with -PRINTER suffix that have no printers assigned
+
+-- Show what will be cleaned up
+SELECT 'Machines to be deactivated (have -PRINTER suffix and no assigned printers):' AS report_section;
+
+SELECT
+    m.machineid,
+    m.machinenumber,
+    m.alias,
+    COUNT(p.printerid) AS printer_count
+FROM machines m
+LEFT JOIN printers p ON m.machineid = p.machineid AND p.isactive = 1
+WHERE m.machinenumber LIKE '%-PRINTER'
+  AND m.isactive = 1
+GROUP BY m.machineid, m.machinenumber, m.alias
+ORDER BY m.machinenumber;
+
+-- Deactivate -PRINTER machines that have no printers assigned
+UPDATE machines m
+SET m.isactive = 0
+WHERE m.machinenumber LIKE '%-PRINTER'
+  AND m.isactive = 1
+  AND NOT EXISTS (
+    SELECT 1 FROM printers p
+    WHERE p.machineid = m.machineid AND p.isactive = 1
+  );
+
+-- Report results
+SELECT CONCAT('Deactivated ', ROW_COUNT(), ' duplicate -PRINTER machines') AS cleanup_result;
+
+SELECT 'Step 7 Complete: Cleaned up duplicate -PRINTER machines' AS status;
+
+
+-- ============================================================================
+-- SECTION 8: MIGRATE PRINTER COORDINATES FROM MACHINES
+-- ============================================================================
+-- Copy machine coordinates to printers that don't have their own coordinates
+
+-- Show state BEFORE migration
+SELECT 'BEFORE MIGRATION - Printer Coordinate Status' AS report_section;
+
+SELECT
+    'Printers with coordinates' AS status,
+    COUNT(*) AS count
+FROM printers
+WHERE maptop IS NOT NULL AND mapleft IS NOT NULL AND isactive = 1
+
+UNION ALL
+
+SELECT
+    'Printers without coordinates' AS status,
+    COUNT(*) AS count
+FROM printers
+WHERE (maptop IS NULL OR mapleft IS NULL) AND isactive = 1;
+
+
+-- Perform the migration - copy coordinates from machines to printers
+UPDATE printers p
+INNER JOIN machines m ON p.machineid = m.machineid
+SET
+    p.maptop = m.maptop,
+    p.mapleft = m.mapleft
+WHERE
+    p.isactive = 1
+    AND p.machineid != 1;  -- Skip TBD/unassigned printers
+
+
+-- Show state AFTER migration
+SELECT 'AFTER MIGRATION - Printer Coordinate Status' AS report_section;
+
+SELECT
+    'Printers with coordinates' AS status,
+    COUNT(*) AS count
+FROM printers
+WHERE maptop IS NOT NULL AND mapleft IS NOT NULL AND isactive = 1
+
+UNION ALL
+
+SELECT
+    'Printers without coordinates' AS status,
+    COUNT(*) AS count
+FROM printers
+WHERE (maptop IS NULL OR mapleft IS NULL) AND isactive = 1;
+
+
+SELECT 'Step 8 Complete: Migrated printer coordinates from machines' AS status;
+
+
+-- ============================================================================
+-- SECTION 9: CREATE USEFUL VIEWS
+-- ============================================================================
+
+-- View: IDF Inventory - Cameras cabled to each IDF
+CREATE OR REPLACE VIEW vw_idf_inventory AS
+SELECT
+  i.idfid,
+  i.idfname,
+  i.description,
+  i.maptop,
+  i.mapleft,
+  COUNT(DISTINCT cam.cameraid) AS camera_count,
+  i.isactive
+FROM idfs i
+LEFT JOIN cameras cam ON i.idfid = cam.idfid AND cam.isactive = 1
+WHERE i.isactive = 1
+GROUP BY i.idfid, i.idfname, i.description, i.maptop, i.mapleft, i.isactive;
+
+
+-- View: Network Device Summary (all infrastructure devices)
+CREATE OR REPLACE VIEW vw_network_devices AS
+SELECT
+  'Switch' AS device_type,
+  switchid AS device_id,
+  serialnumber,
+  ipaddress,
+  description,
+  maptop,
+  mapleft,
+  isactive
+FROM switches
+
+UNION ALL
+
+SELECT
+  'Access Point' AS device_type,
+  apid AS device_id,
+  serialnumber,
+  ipaddress,
+  description,
+  maptop,
+  mapleft,
+  isactive
+FROM accesspoints
+
+UNION ALL
+
+SELECT
+  'Server' AS device_type,
+  serverid AS device_id,
+  serialnumber,
+  ipaddress,
+  description,
+  maptop,
+  mapleft,
+  isactive
+FROM servers
+
+UNION ALL
+
+SELECT
+  'Camera' AS device_type,
+  cameraid AS device_id,
+  serialnumber,
+  ipaddress,
+  description,
+  maptop,
+  mapleft,
+  isactive
+FROM cameras;
+
+
+-- View: Infrastructure Device Counts
+CREATE OR REPLACE VIEW vw_infrastructure_summary AS
+SELECT
+  'Switches' AS device_type,
+  COUNT(*) AS total_count,
+  SUM(CASE WHEN isactive = 1 THEN 1 ELSE 0 END) AS active_count
+FROM switches
+UNION ALL
+SELECT
+  'Access Points' AS device_type,
+  COUNT(*) AS total_count,
+  SUM(CASE WHEN isactive = 1 THEN 1 ELSE 0 END) AS active_count
+FROM accesspoints
+UNION ALL
+SELECT
+  'Servers' AS device_type,
+  COUNT(*) AS total_count,
+  SUM(CASE WHEN isactive = 1 THEN 1 ELSE 0 END) AS active_count
+FROM servers
+UNION ALL
+SELECT
+  'Cameras' AS device_type,
+  COUNT(*) AS total_count,
+  SUM(CASE WHEN isactive = 1 THEN 1 ELSE 0 END) AS active_count
+FROM cameras
+UNION ALL
+SELECT
+  'IDFs' AS device_type,
+  COUNT(*) AS total_count,
+  SUM(CASE WHEN isactive = 1 THEN 1 ELSE 0 END) AS active_count
+FROM idfs;
+
+
+SELECT 'Step 9 Complete: Created infrastructure views' AS status;
+
+
+-- ============================================================================
+-- SECTION 10: FINAL VERIFICATION AND REPORT
+-- ============================================================================
+
+SELECT '============================================' AS sep;
+SELECT 'MIGRATION COMPLETE - FINAL VERIFICATION' AS report_title;
+SELECT '============================================' AS sep;
+
+-- Printers with coordinates
+SELECT 'Printer Coordinate Migration Results:' AS section;
+
+SELECT
+    COUNT(*) AS total_active_printers,
+    SUM(CASE WHEN maptop IS NOT NULL AND mapleft IS NOT NULL THEN 1 ELSE 0 END) AS printers_with_coordinates,
+    SUM(CASE WHEN maptop IS NULL OR mapleft IS NULL THEN 1 ELSE 0 END) AS printers_without_coordinates,
+    ROUND(SUM(CASE WHEN maptop IS NOT NULL AND mapleft IS NOT NULL THEN 1 ELSE 0 END) * 100.0 / COUNT(*), 2) AS percent_with_coordinates
+FROM printers
+WHERE isactive = 1;
+
+-- Infrastructure device counts
+SELECT 'Infrastructure Tables Created:' AS section;
+SELECT * FROM vw_infrastructure_summary;
+
+-- List printers still missing coordinates (if any)
+SELECT 'Printers without coordinates (if any):' AS section;
+
+SELECT
+    p.printerid,
+    p.printerwindowsname,
+    p.ipaddress,
+    p.machineid,
+    m.machinenumber,
+    CASE
+        WHEN p.machineid = 1 THEN 'Not assigned to machine'
+        WHEN m.machineid IS NULL THEN 'Machine not found'
+        WHEN m.maptop IS NULL OR m.mapleft IS NULL THEN 'Machine has no coordinates'
+        ELSE 'Unknown issue'
+    END AS reason
+FROM printers p
+LEFT JOIN machines m ON p.machineid = m.machineid
+WHERE (p.maptop IS NULL OR p.mapleft IS NULL)
+  AND p.isactive = 1
+ORDER BY p.printerid;
+
+-- Verify -PRINTER machines were deactivated
+SELECT 'Cleanup Verification - Remaining active -PRINTER machines:' AS section;
+
+SELECT
+    COUNT(*) AS remaining_printer_machines,
+    CASE
+        WHEN COUNT(*) = 0 THEN 'SUCCESS: All -PRINTER machines deactivated'
+        ELSE 'WARNING: Some -PRINTER machines still active'
+    END AS cleanup_status
+FROM machines
+WHERE machinenumber LIKE '%-PRINTER'
+  AND isactive = 1;
+
+-- Verify table structure changes
+SELECT 'Table Structure Verification:' AS section;
+
+SELECT
+    TABLE_NAME,
+    COLUMN_NAME,
+    DATA_TYPE,
+    IS_NULLABLE
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = 'shopdb'
+  AND TABLE_NAME IN ('printers', 'idfs', 'switches', 'accesspoints', 'servers', 'cameras')
+  AND COLUMN_NAME IN ('maptop', 'mapleft', 'idfname', 'serialnumber', 'macaddress', 'idfid')
+ORDER BY TABLE_NAME, COLUMN_NAME;
+
+-- Count tables
+SELECT 'Total Database Tables:' AS section;
+SELECT COUNT(*) AS table_count FROM information_schema.tables WHERE table_schema = 'shopdb';
+
+-- Re-enable safety features
+SET FOREIGN_KEY_CHECKS = 1;
+SET SQL_SAFE_UPDATES = 1;
+
+SELECT '============================================' AS sep;
+SELECT 'MIGRATION COMPLETED SUCCESSFULLY!' AS final_status;
+SELECT '============================================' AS sep;
+SELECT 'Infrastructure tables created: switches, accesspoints, servers, cameras, idfs' AS note1;
+SELECT 'Printer coordinates migrated from machines' AS note2;
+SELECT 'Ready for application code updates' AS note3;
+
+-- ============================================================================
+-- END OF MIGRATION SCRIPT v2
+-- ============================================================================
--- a/v2/sql/ROLLBACK_infrastructure_migration.sql
+++ b/v2/sql/ROLLBACK_infrastructure_migration.sql
@@ -0,0 +1,311 @@
+-- ============================================================================
+-- ShopDB Infrastructure Enhancement - ROLLBACK SCRIPT
+-- ============================================================================
+-- Purpose: Undo all changes from PRODUCTION_READY_infrastructure_migration.sql
+-- Author: Development Team
+-- Date: 2025-10-22
+-- Version: 1.0
+--
+-- WARNING: This will remove all infrastructure enhancements and printer coordinates!
+-- Only run this if you need to completely undo the migration.
+-- ============================================================================
+
+-- Set session variables for safety
+SET SQL_SAFE_UPDATES = 0;
+SET FOREIGN_KEY_CHECKS = 0;
+
+SELECT '============================================' AS separator;
+SELECT 'STARTING ROLLBACK OF INFRASTRUCTURE MIGRATION' AS status;
+SELECT '============================================' AS separator;
+
+
+-- ============================================================================
+-- SECTION 1: DROP VIEWS CREATED BY MIGRATION
+-- ============================================================================
+
+DROP VIEW IF EXISTS vw_infrastructure_summary;
+DROP VIEW IF EXISTS vw_network_devices;
+DROP VIEW IF EXISTS vw_idf_inventory;
+
+SELECT 'Step 1 Complete: Dropped infrastructure views' AS status;
+
+
+-- ============================================================================
+-- SECTION 2: REMOVE COLUMNS FROM CAMERAS TABLE
+-- ============================================================================
+
+-- Remove foreign key constraint first
+ALTER TABLE cameras DROP FOREIGN KEY IF EXISTS fk_cameras_idf;
+
+-- Drop indexes
+ALTER TABLE cameras DROP INDEX IF EXISTS idx_idfid;
+ALTER TABLE cameras DROP INDEX IF EXISTS idx_serialnumber;
+ALTER TABLE cameras DROP INDEX IF EXISTS idx_macaddress;
+
+-- Remove columns
+ALTER TABLE cameras DROP COLUMN IF EXISTS idfid;
+ALTER TABLE cameras DROP COLUMN IF EXISTS serialnumber;
+ALTER TABLE cameras DROP COLUMN IF EXISTS macaddress;
+
+-- Re-add hostname column
+ALTER TABLE cameras ADD COLUMN hostname VARCHAR(100) AFTER cameraid;
+
+SELECT 'Step 2 Complete: Rolled back cameras table changes' AS status;
+
+
+-- ============================================================================
+-- SECTION 3: REMOVE COLUMNS FROM SERVERS TABLE
+-- ============================================================================
+
+-- Drop indexes
+ALTER TABLE servers DROP INDEX IF EXISTS idx_serialnumber;
+
+-- Remove columns
+ALTER TABLE servers DROP COLUMN IF EXISTS serialnumber;
+
+-- Re-add hostname column
+ALTER TABLE servers ADD COLUMN hostname VARCHAR(100) AFTER serverid;
+
+SELECT 'Step 3 Complete: Rolled back servers table changes' AS status;
+
+
+-- ============================================================================
+-- SECTION 4: REMOVE COLUMNS FROM ACCESSPOINTS TABLE
+-- ============================================================================
+
+-- Drop indexes
+ALTER TABLE accesspoints DROP INDEX IF EXISTS idx_serialnumber;
+
+-- Remove columns
+ALTER TABLE accesspoints DROP COLUMN IF EXISTS serialnumber;
+
+-- Re-add hostname and timestamp columns
+ALTER TABLE accesspoints ADD COLUMN hostname VARCHAR(100) AFTER apid;
+ALTER TABLE accesspoints ADD COLUMN created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP AFTER isactive;
+ALTER TABLE accesspoints ADD COLUMN updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER created_at;
+
+SELECT 'Step 4 Complete: Rolled back accesspoints table changes' AS status;
+
+
+-- ============================================================================
+-- SECTION 5: REMOVE COLUMNS FROM SWITCHES TABLE
+-- ============================================================================
+
+-- Drop indexes
+ALTER TABLE switches DROP INDEX IF EXISTS idx_serialnumber;
+
+-- Remove columns
+ALTER TABLE switches DROP COLUMN IF EXISTS serialnumber;
+
+-- Re-add hostname column
+ALTER TABLE switches ADD COLUMN hostname VARCHAR(100) AFTER switchid;
+
+SELECT 'Step 5 Complete: Rolled back switches table changes' AS status;
+
+
+-- ============================================================================
+-- SECTION 6: ROLLBACK IDFs TABLE STRUCTURE
+-- ============================================================================
+
+-- Drop index
+ALTER TABLE idfs DROP INDEX IF EXISTS idx_idfname;
+
+-- Remove idfname column
+ALTER TABLE idfs DROP COLUMN IF EXISTS idfname;
+
+-- Re-add hostname and ipaddress columns
+ALTER TABLE idfs ADD COLUMN hostname VARCHAR(100) AFTER idfid;
+ALTER TABLE idfs ADD COLUMN ipaddress VARCHAR(45) AFTER hostname;
+
+SELECT 'Step 6 Complete: Rolled back IDFs table changes' AS status;
+
+
+-- ============================================================================
+-- SECTION 7: REMOVE PRINTER COORDINATES
+-- ============================================================================
+
+-- Drop the maptop and mapleft columns from printers
+-- NOTE: This will delete all printer coordinate data!
+ALTER TABLE printers DROP COLUMN IF EXISTS maptop;
+ALTER TABLE printers DROP COLUMN IF EXISTS mapleft;
+
+SELECT 'Step 7 Complete: Removed printer coordinate columns' AS status;
+
+
+-- ============================================================================
+-- SECTION 8: VERIFICATION
+-- ============================================================================
+
+SELECT '============================================' AS separator;
+SELECT 'ROLLBACK VERIFICATION' AS report_title;
+SELECT '============================================' AS separator;
+
+-- Verify columns were removed
+SELECT 'Verifying columns were removed:' AS note;
+
+-- Check printers table (should NOT have maptop/mapleft)
+SELECT
+    CASE
+        WHEN COUNT(*) = 0 THEN '✓ Printers: maptop removed'
+        ELSE '✗ ERROR: Printers still has maptop column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'printers'
+  AND COLUMN_NAME = 'maptop';
+
+SELECT
+    CASE
+        WHEN COUNT(*) = 0 THEN '✓ Printers: mapleft removed'
+        ELSE '✗ ERROR: Printers still has mapleft column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'printers'
+  AND COLUMN_NAME = 'mapleft';
+
+-- Check IDFs table (should have hostname/ipaddress, NOT idfname)
+SELECT
+    CASE
+        WHEN COUNT(*) = 0 THEN '✓ IDFs: idfname removed'
+        ELSE '✗ ERROR: IDFs still has idfname column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'idfs'
+  AND COLUMN_NAME = 'idfname';
+
+SELECT
+    CASE
+        WHEN COUNT(*) = 1 THEN '✓ IDFs: hostname restored'
+        ELSE '✗ ERROR: IDFs missing hostname column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'idfs'
+  AND COLUMN_NAME = 'hostname';
+
+-- Check cameras table (should have hostname, NOT idfid/serialnumber/macaddress)
+SELECT
+    CASE
+        WHEN COUNT(*) = 0 THEN '✓ Cameras: idfid removed'
+        ELSE '✗ ERROR: Cameras still has idfid column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'cameras'
+  AND COLUMN_NAME = 'idfid';
+
+SELECT
+    CASE
+        WHEN COUNT(*) = 1 THEN '✓ Cameras: hostname restored'
+        ELSE '✗ ERROR: Cameras missing hostname column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'cameras'
+  AND COLUMN_NAME = 'hostname';
+
+-- Check switches table (should have hostname, NOT serialnumber)
+SELECT
+    CASE
+        WHEN COUNT(*) = 0 THEN '✓ Switches: serialnumber removed'
+        ELSE '✗ ERROR: Switches still has serialnumber column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'switches'
+  AND COLUMN_NAME = 'serialnumber';
+
+SELECT
+    CASE
+        WHEN COUNT(*) = 1 THEN '✓ Switches: hostname restored'
+        ELSE '✗ ERROR: Switches missing hostname column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'switches'
+  AND COLUMN_NAME = 'hostname';
+
+-- Check accesspoints table (should have hostname and timestamps, NOT serialnumber)
+SELECT
+    CASE
+        WHEN COUNT(*) = 0 THEN '✓ Access Points: serialnumber removed'
+        ELSE '✗ ERROR: Access Points still has serialnumber column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'accesspoints'
+  AND COLUMN_NAME = 'serialnumber';
+
+SELECT
+    CASE
+        WHEN COUNT(*) = 1 THEN '✓ Access Points: hostname restored'
+        ELSE '✗ ERROR: Access Points missing hostname column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'accesspoints'
+  AND COLUMN_NAME = 'hostname';
+
+SELECT
+    CASE
+        WHEN COUNT(*) = 1 THEN '✓ Access Points: created_at restored'
+        ELSE '✗ ERROR: Access Points missing created_at column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'accesspoints'
+  AND COLUMN_NAME = 'created_at';
+
+-- Check servers table (should have hostname, NOT serialnumber)
+SELECT
+    CASE
+        WHEN COUNT(*) = 0 THEN '✓ Servers: serialnumber removed'
+        ELSE '✗ ERROR: Servers still has serialnumber column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'servers'
+  AND COLUMN_NAME = 'serialnumber';
+
+SELECT
+    CASE
+        WHEN COUNT(*) = 1 THEN '✓ Servers: hostname restored'
+        ELSE '✗ ERROR: Servers missing hostname column'
+    END AS verification
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'servers'
+  AND COLUMN_NAME = 'hostname';
+
+-- Verify views were dropped
+SELECT
+    CASE
+        WHEN COUNT(*) = 0 THEN '✓ All infrastructure views removed'
+        ELSE CONCAT('✗ ERROR: ', COUNT(*), ' views still exist')
+    END AS verification
+FROM INFORMATION_SCHEMA.VIEWS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME IN ('vw_infrastructure_summary', 'vw_network_devices', 'vw_idf_inventory');
+
+
+-- ============================================================================
+-- SECTION 9: FINAL STATUS
+-- ============================================================================
+
+-- Re-enable safety features
+SET FOREIGN_KEY_CHECKS = 1;
+SET SQL_SAFE_UPDATES = 1;
+
+SELECT '============================================' AS separator;
+SELECT 'ROLLBACK COMPLETED' AS final_status;
+SELECT '============================================' AS separator;
+
+SELECT 'Database restored to pre-migration state' AS note;
+SELECT 'All infrastructure enhancements have been removed' AS warning;
+SELECT 'Printer coordinates have been deleted' AS data_loss_warning;
+
+-- ============================================================================
+-- END OF ROLLBACK SCRIPT
+-- ============================================================================
--- a/v2/sql/add_device_name_fields.sql
+++ b/v2/sql/add_device_name_fields.sql
@@ -0,0 +1,262 @@
+-- ============================================================================
+-- Add Name Fields to Infrastructure Tables
+-- ============================================================================
+-- Purpose: Add proper name fields to servers, switches, and cameras
+-- Date: 2025-10-23
+-- Reason: All devices should have a name field, not just description
+-- ============================================================================
+
+SET SQL_SAFE_UPDATES = 0;
+SET FOREIGN_KEY_CHECKS = 0;
+
+SELECT '============================================' AS sep;
+SELECT 'ADDING NAME FIELDS TO INFRASTRUCTURE' AS status;
+SELECT '============================================' AS sep;
+
+-- ============================================================================
+-- SECTION 1: ADD NAME FIELD TO SERVERS
+-- ============================================================================
+
+-- Check if column exists
+SET @col_exists_server = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'servers' AND COLUMN_NAME = 'servername');
+
+SET @sql_server = IF(@col_exists_server = 0,
+    'ALTER TABLE servers ADD COLUMN servername VARCHAR(100) AFTER serverid, ADD INDEX idx_servers_servername (servername)',
+    'SELECT "servername already exists" AS notice');
+
+PREPARE stmt FROM @sql_server;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SELECT 'Step 1 Complete: Added servername to servers table' AS status;
+
+
+-- ============================================================================
+-- SECTION 2: ADD NAME FIELD TO SWITCHES
+-- ============================================================================
+
+SET @col_exists_switch = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'switches' AND COLUMN_NAME = 'switchname');
+
+SET @sql_switch = IF(@col_exists_switch = 0,
+    'ALTER TABLE switches ADD COLUMN switchname VARCHAR(100) AFTER switchid, ADD INDEX idx_switches_switchname (switchname)',
+    'SELECT "switchname already exists" AS notice');
+
+PREPARE stmt FROM @sql_switch;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SELECT 'Step 2 Complete: Added switchname to switches table' AS status;
+
+
+-- ============================================================================
+-- SECTION 3: ADD NAME FIELD TO CAMERAS
+-- ============================================================================
+
+SET @col_exists_camera = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'cameras' AND COLUMN_NAME = 'cameraname');
+
+SET @sql_camera = IF(@col_exists_camera = 0,
+    'ALTER TABLE cameras ADD COLUMN cameraname VARCHAR(100) AFTER cameraid, ADD INDEX idx_cameras_cameraname (cameraname)',
+    'SELECT "cameraname already exists" AS notice');
+
+PREPARE stmt FROM @sql_camera;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SELECT 'Step 3 Complete: Added cameraname to cameras table' AS status;
+
+
+-- ============================================================================
+-- SECTION 4: ADD NAME FIELD TO ACCESSPOINTS
+-- ============================================================================
+
+SET @col_exists_ap = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'accesspoints' AND COLUMN_NAME = 'apname');
+
+SET @sql_ap = IF(@col_exists_ap = 0,
+    'ALTER TABLE accesspoints ADD COLUMN apname VARCHAR(100) AFTER apid, ADD INDEX idx_accesspoints_apname (apname)',
+    'SELECT "apname already exists" AS notice');
+
+PREPARE stmt FROM @sql_ap;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SELECT 'Step 4 Complete: Added apname to accesspoints table' AS status;
+
+
+-- ============================================================================
+-- SECTION 5: UPDATE VW_NETWORK_DEVICES VIEW
+-- ============================================================================
+
+-- Drop and recreate view with name fields and camera-specific columns
+DROP VIEW IF EXISTS vw_network_devices;
+
+CREATE VIEW vw_network_devices AS
+SELECT
+  'IDF' AS device_type,
+  i.idfid AS device_id,
+  i.idfname AS device_name,
+  NULL AS modelid,
+  NULL AS modelnumber,
+  NULL AS vendor,
+  NULL AS serialnumber,
+  NULL AS ipaddress,
+  i.description,
+  i.maptop,
+  i.mapleft,
+  i.isactive,
+  NULL AS idfid,
+  NULL AS idfname,
+  NULL AS macaddress
+FROM idfs i
+
+UNION ALL
+
+SELECT
+  'Server' AS device_type,
+  s.serverid AS device_id,
+  s.servername AS device_name,
+  s.modelid,
+  m.modelnumber,
+  v.vendor,
+  s.serialnumber,
+  s.ipaddress,
+  s.description,
+  s.maptop,
+  s.mapleft,
+  s.isactive,
+  NULL AS idfid,
+  NULL AS idfname,
+  NULL AS macaddress
+FROM servers s
+LEFT JOIN models m ON s.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid
+
+UNION ALL
+
+SELECT
+  'Switch' AS device_type,
+  sw.switchid AS device_id,
+  sw.switchname AS device_name,
+  sw.modelid,
+  m.modelnumber,
+  v.vendor,
+  sw.serialnumber,
+  sw.ipaddress,
+  sw.description,
+  sw.maptop,
+  sw.mapleft,
+  sw.isactive,
+  NULL AS idfid,
+  NULL AS idfname,
+  NULL AS macaddress
+FROM switches sw
+LEFT JOIN models m ON sw.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid
+
+UNION ALL
+
+SELECT
+  'Camera' AS device_type,
+  c.cameraid AS device_id,
+  c.cameraname AS device_name,
+  c.modelid,
+  m.modelnumber,
+  v.vendor,
+  c.serialnumber,
+  c.ipaddress,
+  c.description,
+  c.maptop,
+  c.mapleft,
+  c.isactive,
+  c.idfid,
+  i.idfname,
+  c.macaddress
+FROM cameras c
+LEFT JOIN models m ON c.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid
+LEFT JOIN idfs i ON c.idfid = i.idfid
+
+UNION ALL
+
+SELECT
+  'Access Point' AS device_type,
+  a.apid AS device_id,
+  a.apname AS device_name,
+  a.modelid,
+  m.modelnumber,
+  v.vendor,
+  a.serialnumber,
+  a.ipaddress,
+  a.description,
+  a.maptop,
+  a.mapleft,
+  a.isactive,
+  NULL AS idfid,
+  NULL AS idfname,
+  NULL AS macaddress
+FROM accesspoints a
+LEFT JOIN models m ON a.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid
+
+UNION ALL
+
+SELECT
+  'Printer' AS device_type,
+  p.printerid AS device_id,
+  p.printerwindowsname AS device_name,
+  p.modelid,
+  m.modelnumber,
+  v.vendor,
+  p.serialnumber,
+  p.ipaddress,
+  NULL AS description,
+  p.maptop,
+  p.mapleft,
+  p.isactive,
+  NULL AS idfid,
+  NULL AS idfname,
+  NULL AS macaddress
+FROM printers p
+LEFT JOIN models m ON p.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid;
+
+SELECT 'Step 5 Complete: Updated vw_network_devices view with name fields, camera columns, and printers' AS status;
+
+
+-- ============================================================================
+-- SECTION 6: VERIFICATION
+-- ============================================================================
+
+SELECT '============================================' AS sep;
+SELECT 'MIGRATION COMPLETE - VERIFICATION' AS report_title;
+SELECT '============================================' AS sep;
+
+-- Verify name columns were added
+SELECT 'Name Columns in Infrastructure Tables:' AS section;
+SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME IN ('servers', 'switches', 'cameras', 'idfs', 'accesspoints')
+  AND COLUMN_NAME LIKE '%name%'
+ORDER BY TABLE_NAME;
+
+-- Test view
+SELECT 'Testing vw_network_devices view:' AS section;
+SELECT device_type, COUNT(*) as count
+FROM vw_network_devices
+GROUP BY device_type;
+
+-- Re-enable safety features
+SET FOREIGN_KEY_CHECKS = 1;
+SET SQL_SAFE_UPDATES = 1;
+
+SELECT '============================================' AS sep;
+SELECT 'NAME FIELDS ADDED SUCCESSFULLY!' AS final_status;
+SELECT '============================================' AS sep;
+
+-- ============================================================================
+-- END OF MIGRATION SCRIPT
+-- ============================================================================
--- a/v2/sql/add_infrastructure_vendor_model_support.sql
+++ b/v2/sql/add_infrastructure_vendor_model_support.sql
@@ -0,0 +1,234 @@
+-- ============================================================================
+-- Add Vendor and Model Support to Infrastructure Tables
+-- ============================================================================
+-- Purpose: Add vendor/model tracking for servers, switches, and cameras
+-- Date: 2025-10-22
+-- ============================================================================
+
+SET SQL_SAFE_UPDATES = 0;
+SET FOREIGN_KEY_CHECKS = 0;
+
+SELECT '============================================' AS sep;
+SELECT 'ADDING VENDOR/MODEL SUPPORT TO INFRASTRUCTURE' AS status;
+SELECT '============================================' AS sep;
+
+-- ============================================================================
+-- SECTION 1: ADD VENDOR FLAGS FOR INFRASTRUCTURE DEVICES
+-- ============================================================================
+
+-- Check if columns exist before adding
+SET @col_exists_isserver = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'vendors' AND COLUMN_NAME = 'isserver');
+SET @col_exists_isswitch = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'vendors' AND COLUMN_NAME = 'isswitch');
+SET @col_exists_iscamera = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'vendors' AND COLUMN_NAME = 'iscamera');
+
+SET @sql_isserver = IF(@col_exists_isserver = 0,
+    'ALTER TABLE vendors ADD COLUMN isserver BIT(1) DEFAULT b\'0\' AFTER ismachine',
+    'SELECT "isserver already exists" AS notice');
+SET @sql_isswitch = IF(@col_exists_isswitch = 0,
+    'ALTER TABLE vendors ADD COLUMN isswitch BIT(1) DEFAULT b\'0\' AFTER isserver',
+    'SELECT "isswitch already exists" AS notice');
+SET @sql_iscamera = IF(@col_exists_iscamera = 0,
+    'ALTER TABLE vendors ADD COLUMN iscamera BIT(1) DEFAULT b\'0\' AFTER isswitch',
+    'SELECT "iscamera already exists" AS notice');
+
+PREPARE stmt FROM @sql_isserver;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+PREPARE stmt FROM @sql_isswitch;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+PREPARE stmt FROM @sql_iscamera;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SELECT 'Step 1 Complete: Added vendor flags for infrastructure devices' AS status;
+
+
+-- ============================================================================
+-- SECTION 2: ADD MODELID TO SERVERS TABLE
+-- ============================================================================
+
+SET @col_exists = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'servers' AND COLUMN_NAME = 'modelid');
+
+SET @sql = IF(@col_exists = 0,
+    'ALTER TABLE servers ADD COLUMN modelid INT(11) AFTER serverid, ADD INDEX idx_servers_modelid (modelid), ADD CONSTRAINT fk_servers_model FOREIGN KEY (modelid) REFERENCES models(modelnumberid) ON DELETE SET NULL',
+    'SELECT "servers.modelid already exists" AS notice');
+
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SELECT 'Step 2 Complete: Added modelid to servers table' AS status;
+
+
+-- ============================================================================
+-- SECTION 3: ADD MODELID TO SWITCHES TABLE
+-- ============================================================================
+
+SET @col_exists = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'switches' AND COLUMN_NAME = 'modelid');
+
+SET @sql = IF(@col_exists = 0,
+    'ALTER TABLE switches ADD COLUMN modelid INT(11) AFTER switchid, ADD INDEX idx_switches_modelid (modelid), ADD CONSTRAINT fk_switches_model FOREIGN KEY (modelid) REFERENCES models(modelnumberid) ON DELETE SET NULL',
+    'SELECT "switches.modelid already exists" AS notice');
+
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SELECT 'Step 3 Complete: Added modelid to switches table' AS status;
+
+
+-- ============================================================================
+-- SECTION 4: ADD MODELID TO CAMERAS TABLE
+-- ============================================================================
+
+SET @col_exists = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'cameras' AND COLUMN_NAME = 'modelid');
+
+SET @sql = IF(@col_exists = 0,
+    'ALTER TABLE cameras ADD COLUMN modelid INT(11) AFTER cameraid, ADD INDEX idx_modelid (modelid), ADD CONSTRAINT fk_cameras_model FOREIGN KEY (modelid) REFERENCES models(modelnumberid) ON DELETE SET NULL',
+    'SELECT "cameras.modelid already exists" AS notice');
+
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SELECT 'Step 4 Complete: Added modelid to cameras table' AS status;
+
+
+-- ============================================================================
+-- SECTION 5: ADD MODELID TO ACCESSPOINTS TABLE
+-- ============================================================================
+
+SET @col_exists = (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'accesspoints' AND COLUMN_NAME = 'modelid');
+
+SET @sql = IF(@col_exists = 0,
+    'ALTER TABLE accesspoints ADD COLUMN modelid INT(11) AFTER apid, ADD INDEX idx_accesspoints_modelid (modelid), ADD CONSTRAINT fk_accesspoints_model FOREIGN KEY (modelid) REFERENCES models(modelnumberid) ON DELETE SET NULL',
+    'SELECT "accesspoints.modelid already exists" AS notice');
+
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SELECT 'Step 5 Complete: Added modelid to accesspoints table' AS status;
+
+
+-- ============================================================================
+-- SECTION 6: UPDATE INFRASTRUCTURE VIEWS
+-- ============================================================================
+
+-- Drop and recreate vw_network_devices with vendor/model info
+DROP VIEW IF EXISTS vw_network_devices;
+
+CREATE VIEW vw_network_devices AS
+SELECT
+  'Switch' AS device_type,
+  s.switchid AS device_id,
+  s.modelid,
+  m.modelnumber,
+  v.vendor,
+  s.serialnumber,
+  s.ipaddress,
+  s.description,
+  s.maptop,
+  s.mapleft,
+  s.isactive
+FROM switches s
+LEFT JOIN models m ON s.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid
+
+UNION ALL
+
+SELECT
+  'Server' AS device_type,
+  sv.serverid AS device_id,
+  sv.modelid,
+  m.modelnumber,
+  v.vendor,
+  sv.serialnumber,
+  sv.ipaddress,
+  sv.description,
+  sv.maptop,
+  sv.mapleft,
+  sv.isactive
+FROM servers sv
+LEFT JOIN models m ON sv.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid
+
+UNION ALL
+
+SELECT
+  'Camera' AS device_type,
+  c.cameraid AS device_id,
+  c.modelid,
+  m.modelnumber,
+  v.vendor,
+  c.serialnumber,
+  c.ipaddress,
+  c.description,
+  c.maptop,
+  c.mapleft,
+  c.isactive
+FROM cameras c
+LEFT JOIN models m ON c.modelid = m.modelnumberid
+LEFT JOIN vendors v ON m.vendorid = v.vendorid;
+
+SELECT 'Step 6 Complete: Updated vw_network_devices with vendor/model info' AS status;
+
+
+-- ============================================================================
+-- SECTION 7: FINAL VERIFICATION
+-- ============================================================================
+
+SELECT '============================================' AS sep;
+SELECT 'MIGRATION COMPLETE - FINAL VERIFICATION' AS report_title;
+SELECT '============================================' AS sep;
+
+-- Verify vendor flags were added
+SELECT 'Vendor Table Structure:' AS section;
+SELECT COLUMN_NAME, DATA_TYPE
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = 'shopdb'
+  AND TABLE_NAME = 'vendors'
+  AND COLUMN_NAME IN ('isprinter', 'ispc', 'ismachine', 'isserver', 'isswitch', 'iscamera')
+ORDER BY ORDINAL_POSITION;
+
+-- Verify modelid columns were added
+SELECT 'Infrastructure Tables with modelid:' AS section;
+SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA = 'shopdb'
+  AND TABLE_NAME IN ('servers', 'switches', 'cameras', 'accesspoints')
+  AND COLUMN_NAME = 'modelid'
+ORDER BY TABLE_NAME;
+
+-- Verify foreign keys
+SELECT 'Foreign Key Constraints:' AS section;
+SELECT TABLE_NAME, CONSTRAINT_NAME, REFERENCED_TABLE_NAME
+FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
+WHERE TABLE_SCHEMA = 'shopdb'
+  AND TABLE_NAME IN ('servers', 'switches', 'cameras', 'accesspoints')
+  AND REFERENCED_TABLE_NAME = 'models'
+ORDER BY TABLE_NAME;
+
+-- Re-enable safety features
+SET FOREIGN_KEY_CHECKS = 1;
+SET SQL_SAFE_UPDATES = 1;
+
+SELECT '============================================' AS sep;
+SELECT 'VENDOR/MODEL SUPPORT ADDED SUCCESSFULLY!' AS final_status;
+SELECT '============================================' AS sep;
+SELECT 'Infrastructure devices can now use vendors and models tables' AS note1;
+SELECT 'Next: Add vendor/model data for existing infrastructure' AS note2;
+
+-- ============================================================================
+-- END OF MIGRATION SCRIPT
+-- ============================================================================