Issue #5450 - Bulk convert to latin1

* Unable to bulk convert to latin1 if desired * Minor paranoa on audit_database.php
Cacti · Aug 12, 2023 · ea05cd5 · ea05cd5
1 parent 8ec64bd
commit ea05cd5
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -65,6 +65,7 @@ Cacti CHANGELOG
 -issue#5440: Device class not saved when importing a template during a new installation 
 -issue#5446: Duplication functions for Graph/Template and Data Source/Template do not return an id
 -issue#5447: Duplication of Device Templates happens in the base Cacti file and not in an API file
+-issue#5450: Unable to bulk convert to latin1 if desired
 -feature#5375: Add template for Fortinet firewall and Aruba Instant cluster
 -feature#5393: Add template for SNMP printer
 -feature#5418: Display device class before package import 

diff --git a/cli/audit_database.php b/cli/audit_database.php
@@ -325,10 +325,16 @@ function repair_database($run = true) {
 				AND TABLE_NAME = ?',
 				array($database_default, $table));
 
+			if (isset($tblinfo['COLLATION'])) {
+				$collation = $tblinfo['COLLATION'];
+			} else {
+				$collation = 'utf8mb4';
+			}
+
 			if ($tblinfo['ENGINE'] == 'MyISAM') {
-				$suffix = ",\n   ENGINE=InnoDB ROW_FORMAT=Dynamic CHARSET=" . $tblinfo['COLLATION'];
+				$suffix = ",\n   ENGINE=InnoDB ROW_FORMAT=Dynamic CHARSET=" . $collation;
 			} else {
-				$suffix = ",\n   ROW_FORMAT=Dynamic CHARSET=" . $tblinfo['COLLATION'];
+				$suffix = ",\n   ROW_FORMAT=Dynamic CHARSET=" . $collation;
 			}
 
 			$sql = 'ALTER TABLE `' . $table . "`\n   " . implode(",\n   ", $changes) . $suffix . ';';

diff --git a/cli/convert_tables.php b/cli/convert_tables.php
@@ -33,6 +33,7 @@
 
 $innodb      = false;
 $utf8        = false;
+$latin       = false;
 $debug       = false;
 $size        = 1000000;
 $force       = false;
@@ -79,6 +80,10 @@
 			case '--innodb':
 				$innodb = true;
 				break;
+			case '-l':
+			case '--latin1':
+				$latin = true;
+				break;
 			case '-n':
 			case '--skip-innodb':
 				$skip_tables = explode(' ', $value);
@@ -119,8 +124,8 @@
 	exit;
 }
 
-if (!($innodb || $utf8)) {
-	print_or_log($installer,  "ERROR: Must select either UTF8 or InnoDB conversion.\n\n");
+if (!($innodb || $utf8 || $latin)) {
+	print_or_log($installer,  "ERROR: Must select either UTF8, LATIN1 or InnoDB conversion.\n\n");
 	display_help();
 	exit;
 }
@@ -191,6 +196,10 @@
 			$canConvert = $table['Collation'] != 'utf8mb4_unicode_ci';
 		}
 
+		if (!$canConvert && $latin) {
+			$canConvert = $table['Collation'] != 'latin1';
+		}
+
 		if ($dynamic && $table['Row_format'] == 'Compact') {
 			$canConvert = true;
 		}
@@ -202,6 +211,8 @@
 				$sql = '';
 				if ($utf8) {
 					$sql .= ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci';
+				} elseif ($latin) {
+					$sql .= ' CONVERT TO CHARACTER SET latin1';
 				}
 
 				if ($innodb && $canInnoDB) {
@@ -252,12 +263,13 @@ function display_version() {
 function display_help () {
 	display_version();
 
-	print "\nusage: convert_tables.php [--debug] [--innodb] [--utf8] [--table=N] [--size=N] [--rebuild] [--dynamic]\n\n";
+	print "\nusage: convert_tables.php [--debug] [--innodb] [--utf8] [--latin1] [--table=N] [--size=N] [--rebuild] [--dynamic]\n\n";
 	print "A utility to convert a Cacti Database from MyISAM to the InnoDB table format.\n";
 	print "MEMORY tables are not converted to InnoDB in this process.\n\n";
 	print "Required (one or more):\n";
 	print "-i | --innodb  - Convert any MyISAM tables to InnoDB\n";
-	print "-u | --utf8    - Convert any non-UTF8 tables to utf8mb4_unicode_ci\n\n";
+	print "-u | --utf8    - Convert any non-UTF8 tables to utf8mb4_unicode_ci\n";
+	print "-l | --latin1  - Convert any non-latin1 tables to latin1\n\n";
 	print "Optional:\n";
 	print "-t | --table=S - The name of a single table to change\n";
 	print "-n | --skip-innodb=\"table1 table2 ...\" - Skip converting tables to InnoDB\n";