mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 19:30:25 +02:00
Code Issues Releases Wiki Activity

Fixed regression: db_verify distinguish results

Browse Source 
Regression in #2999 prevents db_verify from distinguishing fields from indices

This prevents database migrations where both the fields and the indices of a
field need to be updated in one migration.

This commit fixes that.

Fixes: #3001
This commit is contained in:
Nick Liu
2018-01-23 14:03:23 -06:00
parent 3e2cdd5c9e
commit a397b80640
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
foreach(['field', 'index'] as $type)
{
$results = 'results';
if ($type === 'index') $results = 'indices';
foreach($fileData[$type] as $key => $value)
{
$this->results[$tbl][$key]['_status'] = 'ok';
$this->{$results}[$tbl][$key]['_status'] = 'ok';
//print("EXPECTED");
//print_a($value);
@@ -368,18 +370,18 @@ class db_verify
if(!is_array($sqlData[$type][$key]))
{
$this->errors[$tbl]['_status'] = 'error'; // table status
$this->results[$tbl][$key]['_status'] = "missing_$type"; // type status
$this->results[$tbl][$key]['_valid'] = $value;
$this->results[$tbl][$key]['_file'] = $selection;
$this->{$results}[$tbl][$key]['_status'] = "missing_$type"; // type status
$this->{$results}[$tbl][$key]['_valid'] = $value;
$this->{$results}[$tbl][$key]['_file'] = $selection;
}
elseif(count($diff = $this->diffStructurePermissive($value, $sqlData[$type][$key])))
{
$this->errors[$tbl]['_status'] = "mismatch_$type";
$this->results[$tbl][$key]['_status'] = 'mismatch';
$this->results[$tbl][$key]['_diff'] = $diff;
$this->results[$tbl][$key]['_valid'] = $value;
$this->results[$tbl][$key]['_invalid'] = $sqlData[$type][$key];
$this->results[$tbl][$key]['_file'] = $selection;
$this->{$results}[$tbl][$key]['_status'] = 'mismatch';
$this->{$results}[$tbl][$key]['_diff'] = $diff;
$this->{$results}[$tbl][$key]['_valid'] = $value;
$this->{$results}[$tbl][$key]['_invalid'] = $sqlData[$type][$key];
$this->{$results}[$tbl][$key]['_file'] = $selection;
}
// TODO Check for additional fields in SQL that should be removed.