Going to have to redo v3.2 again

TheWitness · TheWitness · commit 11fb4292cf4c · 2020-11-28T13:29:23.000-05:00
diff --git a/setup.php b/setup.php
@@ -112,14 +112,14 @@ function plugin_flowview_check_upgrade() {
 				$good = db_fetch_row("SHOW INDEXES
 					FROM `" . $t['TABLE_NAME'] . "`
 					WHERE Key_name='keycol'
-					AND Column_name='end_time';");
+					AND Column_name='src_if';");
 
 				if (!cacti_sizeof($good)) {
 					cacti_log('NOTE: Updating unique key for ' . $t['TABLE_NAME'], false, 'FLOWVIEW');
 
 					db_execute('ALTER TABLE ' . $t['TABLE_NAME'] . '
 						DROP INDEX `keycol`,
-						ADD UNIQUE INDEX `keycol` (`listener_id`,`src_addr`,`src_port`,`dst_addr`,`dst_port`, `start_time`, `end_time`)');
+						ADD UNIQUE INDEX `keycol` (`listener_id`, `src_addr`, `src_port`, `src_if`,`dst_addr`,`dst_port`, `dst_if`, `start_time`, `end_time`)');
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -112,14 +112,14 @@ function plugin_flowview_check_upgrade() {`
`112`	`112`	`$good = db_fetch_row("SHOW INDEXES`
`113`	`113`	FROM `" . $t['TABLE_NAME'] . "`
`114`	`114`	`WHERE Key_name='keycol'`
`115`		`- AND Column_name='end_time';");`
	`115`	`+ AND Column_name='src_if';");`
`116`	`116`
`117`	`117`	`if (!cacti_sizeof($good)) {`
`118`	`118`	`cacti_log('NOTE: Updating unique key for ' . $t['TABLE_NAME'], false, 'FLOWVIEW');`
`119`	`119`
`120`	`120`	`db_execute('ALTER TABLE ' . $t['TABLE_NAME'] . '`
`121`	`121`	DROP INDEX `keycol`,
`122`		- ADD UNIQUE INDEX `keycol` (`listener_id`,`src_addr`,`src_port`,`dst_addr`,`dst_port`, `start_time`, `end_time`)');
	`122`	+ ADD UNIQUE INDEX `keycol` (`listener_id`, `src_addr`, `src_port`, `src_if`,`dst_addr`,`dst_port`, `dst_if`, `start_time`, `end_time`)');
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`}`