Resolving issue #2360

When retrieving database / table / column information, schema name is not always applied.

CHANGELOG

@@ -17,6 +17,7 @@ Cacti CHANGELOG
 -issue#2355: Duplicated Data Sources created when Custom Data is specified
 -issue#2357: Poller issuing warnings with little way to diagnose
 -issue#2359: "Install/Upgrade" privilege lost, blocking upgrades
+-issue#2360: When retrieving database / table / column information, schema name is not always applied
 -issue#2362: No way to default an interface speed when ifSpeed and ifHighSpeed come back as zero
 -issue#2365: Graphs included in aggregate that are removed are not managed properly
 -issue#2372: SNMP DS with dskPath Index Type does not work

cli/sqltable_to_php.php

@@ -174,7 +174,12 @@ function sqltable_to_php($table, $create, $plugin = '') {
 			//exit;
 		}
 
-		$result = db_fetch_row("SELECT ENGINE, TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_NAME = '$table'");
+		$result = db_fetch_row_prepared('select ENGINE, TABLE_COMMENT
+			FROM information_schema.TABLES
+			WHERE TABLE_SCHEMA = SCHEMA()
+			AND TABLE_NAME = ?',
+			array($table));
+
 		if (cacti_sizeof($result)) {
 			$text .= "\$data['type'] = '" . $result['ENGINE'] . "';\n";
 			$text .= "\$data['comment'] = '" . $result['TABLE_COMMENT'] . "';\n";

lib/boost.php

@@ -48,10 +48,11 @@ function boost_file_size_display($file_size, $digits = 2) {
 }
 
 function boost_get_total_rows() {
-	return db_fetch_cell("SELECT SUM(TABLE_ROWS) FROM INFORMATION_SCHEMA.TABLES
-		WHERE table_schema=SCHEMA()
-		AND (table_name LIKE 'poller_output_boost_arch_%' OR table_name LIKE 'poller_output_boost')
-		GROUP BY table_schema");
+	return db_fetch_cell("SELECT SUM(TABLE_ROWS)
+		FROM information_schema.tables
+		WHERE table_schema = SCHEMA()
+		AND (table_name LIKE 'poller_output_boost_arch_%'
+		OR table_name LIKE 'poller_output_boost'");
 }
 
 function boost_error_handler($errno, $errmsg, $filename, $linenum, $vars) {
@@ -582,11 +583,9 @@ function boost_timer_get_overhead() {
 
 /* boost_get_arch_table_name - returns current archive boost table or false if no arch table is present currently */
 function boost_get_arch_table_name() {
-	global $database_default;
-
 	$tables = db_fetch_assoc("SELECT table_name AS name
 		FROM information_schema.tables
-		WHERE table_schema = '$database_default'
+		WHERE table_schema = SCHEMA()
 		AND table_name LIKE 'poller_output_boost_arch_%'");
 
 	foreach($tables as $table) {
@@ -653,7 +652,7 @@ function boost_process_poller_output($local_data_id = '', $rrdtool_pipe = '') {
 		$query_string = '';
 		$arch_tables  = db_fetch_assoc("SELECT table_name AS name
 			FROM information_schema.tables
-			WHERE table_schema = '$database_default'
+			WHERE table_schema = SCHEMA()
 			AND table_name LIKE 'poller_output_boost_arch_%'");
 
 		if (cacti_count($arch_tables)) {
@@ -687,7 +686,7 @@ function boost_process_poller_output($local_data_id = '', $rrdtool_pipe = '') {
 		$query_string = '';
 		$arch_tables  = db_fetch_assoc("SELECT table_name AS name
 			FROM information_schema.tables
-			WHERE table_schema = '$database_default'
+			WHERE table_schema = SCHEMA()
 			AND table_name LIKE 'poller_output_boost_arch_%'");
 
 		if (cacti_count($arch_tables)) {
@@ -1341,9 +1340,10 @@ function boost_update_snmp_statistics () {
 
 	/* get the boost table status */
 	$boost_table_status = db_fetch_assoc("SELECT *
-		FROM INFORMATION_SCHEMA.TABLES
-		WHERE table_schema=SCHEMA()
-		AND (table_name LIKE 'poller_output_boost_arch_%' OR table_name LIKE 'poller_output_boost')");
+		FROM information_schema.tables
+		WHERE table_schema = SCHEMA()
+		AND (table_name LIKE 'poller_output_boost_arch_%'
+		OR table_name LIKE 'poller_output_boost')");
 
 	$total_data_sources = db_fetch_cell('SELECT COUNT(*) FROM poller_item');
 

lib/database.php

@@ -891,7 +891,11 @@ function db_update_table($table, $data, $removecolumns = false, $log = true, $db
 		}
 	}
 
-	$info = db_fetch_row("SELECT ENGINE, TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_NAME = '$table'", $log, $db_conn);
+	$info = db_fetch_row("SELECT ENGINE, TABLE_COMMENT
+		FROM information_schema.TABLES
+		WHERE TABLE_SCHEMA = SCHEMA()
+		AND TABLE_NAME = '$table'", $log, $db_conn);
+
 	if (isset($info['TABLE_COMMENT']) && str_replace("'", '', $info['TABLE_COMMENT']) != str_replace("'", '', $data['comment'])) {
 		if (!db_execute("ALTER TABLE `$table` COMMENT '" . str_replace("'", '', $data['comment']) . "'", $log, $db_conn)) {
 			return false;
@@ -1433,7 +1437,11 @@ function db_get_column_attributes($table, $columns) {
 		$columns = explode(',', $columns);
 	}
 
-	$sql = 'SELECT * FROM information_schema.columns WHERE table_name = ? and column_name IN (';
+	$sql = 'SELECT * FROM information_schema.columns
+		WHERE table_schema = SCHEMA()
+		AND table_name = ?
+		AND column_name IN (';
+
 	$column_names = array();
 	foreach ($columns as $column) {
 		if (!empty($column)) {
@@ -1496,3 +1504,13 @@ function db_error() {
 	return $database_last_error;
 }
 
+// db_get_default_database - Get the database name of the current database or return the default database name
+// @returns - string - either current db name or configuration default if no connection/name
+function db_get_default_database($db_conn = false) {
+	global $database_default;
+
+	$database = db_fetch_cell('SELECT DATABASE()', '', true, $db_conn);
+	if (empty($database)) {
+		$database = $database_default;
+	}
+}

poller_boost.php

@@ -273,9 +273,9 @@ function output_rrd_data($start_time, $force = false) {
 
 	$more_arch_tables = db_fetch_assoc_prepared("SELECT table_name AS name
 		FROM information_schema.tables
-		WHERE table_schema = ?
+		WHERE table_schema = SCHEMA()
 		AND table_name LIKE 'poller_output_boost_arch_%'
-		AND table_name != ?", array($database_default, $archive_table));
+		AND table_name != ?", array($archive_table));
 
 	if (cacti_count($more_arch_tables)) {
 		foreach($more_arch_tables as $table) {
@@ -336,7 +336,7 @@ function output_rrd_data($start_time, $force = false) {
 	/* cleanup  - remove empty arch tables */
 	$tables = db_fetch_assoc("SELECT table_name AS name
 		FROM information_schema.tables
-		WHERE table_schema=SCHEMA()
+		WHERE table_schema = SCHEMA()
 		AND table_name LIKE 'poller_output_boost_arch_%'");
 
 	if (cacti_count($tables)) {

utilities.php

@@ -142,7 +142,7 @@ function utilities_view_tech($php_info = '') {
 	/* Get table status */
 	$tables = db_fetch_assoc_prepared('SELECT *
 		FROM information_schema.tables
-		WHERE table_schema = ?', array($database_default));
+		WHERE table_schema = SCHEMA()');
 
 	/* Get poller stats */
 	$poller_item = db_fetch_assoc('SELECT action, count(action) AS total
@@ -2047,8 +2047,10 @@ function applyFilter() {
 
 	/* get the boost table status */
 	$boost_table_status = db_fetch_assoc("SELECT *
-		FROM INFORMATION_SCHEMA.TABLES WHERE table_schema=SCHEMA()
-		AND (table_name LIKE 'poller_output_boost_arch_%' OR table_name LIKE 'poller_output_boost')");
+		FROM INFORMATION_SCHEMA.TABLES
+		WHERE table_schema = SCHEMA()
+		AND (table_name LIKE 'poller_output_boost_arch_%'
+		OR table_name LIKE 'poller_output_boost')");
 
 	$pending_records = 0;
 	$arch_records    = 0;