QA: Having to add back last_state which is used

Cacti · Jan 2, 2025 · 6edc4ae · 6edc4ae
1 parent 0947967
commit 6edc4ae
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/lib/funct_shared.php b/lib/funct_shared.php
@@ -753,7 +753,6 @@ function get_template_status($template_id) {
 	return $status;
 }
 
-
 function in_process($report_id, $status = 1) {
 	$now = date("Y-m-d H:i:s");
 
@@ -763,7 +762,6 @@ function in_process($report_id, $status = 1) {
 		array($status, $now, $report_id));;
 }
 
-
 function stat_process($report_id) {
 	$sql = "SELECT state FROM plugin_reportit_reports WHERE id=$report_id";
 	return db_fetch_cell($sql);
@@ -810,8 +808,6 @@ function config_date_format($no_time=true) {
 		return $dd;
 }
 
-
-
 /* ********************* New functions ********************************* */
 function debug(&$value, $msg = '', $fmsg = '') {
 	if (!defined('REPORTIT_DEBUG')) {

diff --git a/poller_reportit.php b/poller_reportit.php
@@ -149,19 +149,20 @@ function run_report($report_id) {
 	$start = microtime(true);
 	$start_time = time();
 
-	$report = db_fetch_row_prepared("SELECT a.id, a.template_id, a.name
-		FROM plugin_reportit_reports AS a
-		INNER JOIN plugin_reportit_templates AS b
-		ON b.locked = ''
-		AND a.template_id = b.id
-		WHERE a.id = ?",
+	$report = db_fetch_row_prepared("SELECT report.*
+		FROM plugin_reportit_reports AS report
+		INNER JOIN plugin_reportit_templates AS template
+		ON template.locked = ''
+		AND report.template_id = template.id
+		WHERE report.id = ?",
 		array($report_id));
 
 	if (!cacti_sizeof($report)) {
 		print PHP_EOL . PHP_EOL . "ERROR: Invalid report ID !" . PHP_EOL;
 		display_help();
 	} else {
 		$start_time = time();
+
 		if (!get_template_status($report['template_id'])) {
 			$report_id = $report['id'];
 
@@ -183,7 +184,7 @@ function run_report($report_id) {
 		WHERE id = ?',
 		array(
 			date('Y-m-d H:i:s', $start_time),
-			$end-$start,
+			$end - $start,
 			$report_id
 		)
 	);

diff --git a/system/install.php b/system/install.php
@@ -47,6 +47,7 @@ function reportit_recreate_cache_tables() {
 
 	/* status column */
 	$data['columns'][] = array('name' => 'state', 'type' => 'tinyint(1)', 'NULL' => false, 'default' => '0');
+	$data['columns'][] = array('name' => 'last_state', 'type' => 'timestamp', 'NULL' => true);
 
 	/* archive specific columns */
 	$data['columns'][] = array('name' => 'owner','type' => 'varchar(20)', 'NULL' => false, 'default' => '');
@@ -163,6 +164,7 @@ function reportit_system_install() {
 
 	/* status column */
 	$data['columns'][] = array('name' => 'state', 'type' => 'tinyint(1)', 'NULL' => false, 'default' => '0');
+	$data['columns'][] = array('name' => 'last_state', 'type' => 'timestamp', 'NULL' => true);
 
 	/* scheduling attributes */
 	$data['columns'][] = array('name' => 'sched_type', 'unsigned' => true, 'type' => 'int(10)', 'NULL' => false, 'default' => '0');

diff --git a/system/upgrade.php b/system/upgrade.php
@@ -397,9 +397,12 @@ function reportit_system_upgrade($old_version) {
 				}
 
 				db_execute('ALTER TABLE plugin_reportit_reports DROP COLUMN enabled');
-				db_execute('ALTER TABLE plugin_reportit_reports DROP COLUMN state');
 				db_execute('ALTER TABLE plugin_reportit_reports ADD COLUMN enabled char(2) NOT NULL default "" AFTER name');
-				db_execute('ALTER TABLE plugin_reportit_reports ADD COLUMN state tinyint(3) unsigned NOT NULL default "0" AFTER enabled');
+
+				db_execute('ALTER TABLE plugin_reportit_reports DROP COLUMN state, DROP COLUMN last_state');
+				db_execute('ALTER TABLE plugin_reportit_reports
+					ADD COLUMN state tinyint(1) unsigned NOT NULL default "0" AFTER enabled,
+					ADD COLUMN last_state timestamp default NULL AFTER state');
 
 				foreach($reports as $r) {
 					switch($r['frequency']) {
@@ -507,12 +510,16 @@ function reportit_system_upgrade($old_version) {
 			} else {
 				db_execute('ALTER TABLE plugin_reportit_reports DROP COLUMN enabled');
 				db_execute('ALTER TABLE plugin_reportit_reports ADD COLUMN enabled char(2) NOT NULL default "" AFTER name');
+
+				db_execute('ALTER TABLE plugin_reportit_reports DROP COLUMN state, DROP COLUMN last_state');
+				db_execute('ALTER TABLE plugin_reportit_reports
+					ADD COLUMN state tinyint(1) unsigned NOT NULL default "0" AFTER enabled,
+					ADD COLUMN last_state timestamp default NULL AFTER state');
 			}
 
 			$drop_columns = array(
 				'frequency',
 				'last_run',
-				'last_state',
 				'runtime',
 				'autoexport',
 				'autoexport_max_records',
@@ -523,7 +530,7 @@ function reportit_system_upgrade($old_version) {
 			$alter = 'ALTER TABLE plugin_reportit_reports';
 			$alter = '';
 			foreach($drop_columns as $c) {
-				if (db_column_exists('plugin_reportit_reports', 'last_state')) {
+				if (db_column_exists('plugin_reportit_reports', $c)) {
 					$alter .= ($alter != '' ? ', ':'') . "DROP COLUMN `$c`";
 				}
 			}