GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

suppress notices for non-present sections

Browse Source
This commit is contained in:
Brion Vibber 2010-10-13 16:11:02 -07:00
parent 229c772634
commit c0bb3062f6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/schema.php
View File

@ -492,9 +492,9 @@ class Schema
$def = $this->filterDef($def);
// @fixme check if not present
$fields = $this->diffArrays($old['fields'], $def['fields'], array($this, 'columnsEqual'));
$uniques = $this->diffArrays($old['unique keys'], $def['unique keys']);
$indexes = $this->diffArrays($old['indexes'], $def['indexes']);
$fields = $this->diffArrays($old, $def, 'fields', array($this, 'columnsEqual'));
$uniques = $this->diffArrays($old, $def, 'unique keys');
$indexes = $this->diffArrays($old, $def, 'indexes');
$total = $fields['count'] + $uniques['count'] + $indexes['count'];
if ($total == 0) {
@ -535,11 +535,13 @@ class Schema
return array($sql);
}
function diffArrays($old, $new, $compareCallback=null)
function diffArrays($oldDef, $newDef, $section, $compareCallback=null)
{
$old = isset($oldDef[$section]) ? $oldDef[$section] : array();
$new = isset($newDef[$section]) ? $newDef[$section] : array();
$oldKeys = array_keys($old ? $old : array());
$newKeys = array_keys($new ? $new : array());
$oldKeys = array_keys($old);
$newKeys = array_keys($new);
$toadd = array_diff($newKeys, $oldKeys);
$todrop = array_diff($oldKeys, $newKeys);