From c0bb3062f63638601a9855df93cdaef963ef628e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Oct 2010 16:11:02 -0700
Subject: suppress notices for non-present sections

---
 lib/schema.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'lib/schema.php')

diff --git a/lib/schema.php b/lib/schema.php
index da43c0559..f42226bad 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -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);
-- 
cgit v1.2.3-54-g00ecf