mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3002 from Deltik/master

Browse Source 
Fixes: #3001 Regression: db_verify distinguish results
This commit is contained in:
Cameron
2018-01-23 12:12:46 -08:00
committed by GitHub
parent d1ac8c62f7 a397b80640
commit 5b1d9ae820
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/db_verify_class.php
View File

@@ -356,9 +356,11 @@ class db_verify
// Check field and index data // Check field and index data
foreach(['field', 'index'] as $type) foreach(['field', 'index'] as $type)
{ {
$results = 'results';
if ($type === 'index') $results = 'indices';
foreach($fileData[$type] as $key => $value) foreach($fileData[$type] as $key => $value)
{ {
$this->results[$tbl][$key]['_status'] = 'ok'; $this->{$results}[$tbl][$key]['_status'] = 'ok';
//print("EXPECTED"); //print("EXPECTED");
//print_a($value); //print_a($value);
@@ -368,18 +370,18 @@ class db_verify
if(!is_array($sqlData[$type][$key])) if(!is_array($sqlData[$type][$key]))
{ {
$this->errors[$tbl]['_status'] = 'error'; // table status $this->errors[$tbl]['_status'] = 'error'; // table status
$this->results[$tbl][$key]['_status'] = "missing_$type"; // type status $this->{$results}[$tbl][$key]['_status'] = "missing_$type"; // type status
$this->results[$tbl][$key]['_valid'] = $value; $this->{$results}[$tbl][$key]['_valid'] = $value;
$this->results[$tbl][$key]['_file'] = $selection; $this->{$results}[$tbl][$key]['_file'] = $selection;
} }
elseif(count($diff = $this->diffStructurePermissive($value, $sqlData[$type][$key]))) elseif(count($diff = $this->diffStructurePermissive($value, $sqlData[$type][$key])))
{ {
$this->errors[$tbl]['_status'] = "mismatch_$type"; $this->errors[$tbl]['_status'] = "mismatch_$type";
$this->results[$tbl][$key]['_status'] = 'mismatch'; $this->{$results}[$tbl][$key]['_status'] = 'mismatch';
$this->results[$tbl][$key]['_diff'] = $diff; $this->{$results}[$tbl][$key]['_diff'] = $diff;
$this->results[$tbl][$key]['_valid'] = $value; $this->{$results}[$tbl][$key]['_valid'] = $value;
$this->results[$tbl][$key]['_invalid'] = $sqlData[$type][$key]; $this->{$results}[$tbl][$key]['_invalid'] = $sqlData[$type][$key];
$this->results[$tbl][$key]['_file'] = $selection; $this->{$results}[$tbl][$key]['_file'] = $selection;
} }
// TODO Check for additional fields in SQL that should be removed. // TODO Check for additional fields in SQL that should be removed.