From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sun, 10 Oct 2010 15:53:23 +0000 (-0400)
Subject: Fix viral error, column name(s) for indexes are passed as an array.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0619c944f6d4e4a56044ab56780e219d9802e526;p=horde.git

Fix viral error, column name(s) for indexes are passed as an array.
---

diff --git a/ingo/migration/1_ingo_base_tables.php b/ingo/migration/1_ingo_base_tables.php
index 17986744e..2f7be1d4e 100644
--- a/ingo/migration/1_ingo_base_tables.php
+++ b/ingo/migration/1_ingo_base_tables.php
@@ -93,11 +93,11 @@ class IngoBaseTables extends Horde_Db_Migration_Base
             $t->primaryKey(array('share_id'));
             $t->end();
 
-            $this->addIndex('ingo_shares', 'share_name');
-            $this->addIndex('ingo_shares', 'share_owner');
-            $this->addIndex('ingo_shares', 'perm_creator');
-            $this->addIndex('ingo_shares', 'perm_default');
-            $this->addIndex('ingo_shares', 'perm_guest');
+            $this->addIndex('ingo_shares', array('share_name'));
+            $this->addIndex('ingo_shares', array('share_owner'));
+            $this->addIndex('ingo_shares', array('perm_creator'));
+            $this->addIndex('ingo_shares', array('perm_default'));
+            $this->addIndex('ingo_shares', array('perm_guest'));
         }
 
         if (!in_array('ingo_shares_groups', $tableList)) {
@@ -107,8 +107,8 @@ class IngoBaseTables extends Horde_Db_Migration_Base
             $t->column('perm', 'integer', array('null' => false));
             $t->end();
 
-            $this->addIndex('ingo_shares_groups', 'share_id');
-            $this->addIndex('ingo_shares_groups', 'group_uid');
+            $this->addIndex('ingo_shares_groups', array('share_id'));
+            $this->addIndex('ingo_shares_groups', array('group_uid'));
             $this->addIndex('ingo_shares_groups', 'perm');
         }
 
@@ -119,9 +119,9 @@ class IngoBaseTables extends Horde_Db_Migration_Base
             $t->column('perm', 'integer', array('null' => false));
             $t->end();
 
-            $this->addIndex('ingo_shares_users', 'share_id');
-            $this->addIndex('ingo_shares_users', 'user_uid');
-            $this->addIndex('ingo_shares_users', 'perm');
+            $this->addIndex('ingo_shares_users', array('share_id'));
+            $this->addIndex('ingo_shares_users', array('user_uid'));
+            $this->addIndex('ingo_shares_users', array('perm'));
         }
 
     }
diff --git a/kronolith/migration/1_kronolith_base_tables.php b/kronolith/migration/1_kronolith_base_tables.php
index ea25daf48..24d2fd59c 100644
--- a/kronolith/migration/1_kronolith_base_tables.php
+++ b/kronolith/migration/1_kronolith_base_tables.php
@@ -59,8 +59,8 @@ class KronolithBaseTables extends Horde_Db_Migration_Base
             $t->column('vfb_serialized', 'text', array('null' => false));
             $t->end();
 
-            $this->addIndex('kronolith_storage', 'vfb_owner');
-            $this->addIndex('kronolith_storage', 'vfb_email');
+            $this->addIndex('kronolith_storage', array('vfb_owner'));
+            $this->addIndex('kronolith_storage', array('vfb_email'));
         }
 
         if (!in_array('kronolith_shares', $tableList)) {
@@ -77,11 +77,11 @@ class KronolithBaseTables extends Horde_Db_Migration_Base
             $t->primaryKey(array('share_id'));
             $t->end();
 
-            $this->addIndex('kronolith_shares', 'share_name');
-            $this->addIndex('kronolith_shares', 'share_owner');
-            $this->addIndex('kronolith_shares', 'perm_creator');
-            $this->addIndex('kronolith_shares', 'perm_default');
-            $this->addIndex('kronolith_shares', 'perm_guest');
+            $this->addIndex('kronolith_shares', array('share_name'));
+            $this->addIndex('kronolith_shares', array('share_owner'));
+            $this->addIndex('kronolith_shares', array('perm_creator'));
+            $this->addIndex('kronolith_shares', array('perm_default'));
+            $this->addIndex('kronolith_shares', array('perm_guest'));
         }
 
         if (!in_array('kronolith_shares_groups', $tableList)) {
@@ -91,9 +91,9 @@ class KronolithBaseTables extends Horde_Db_Migration_Base
             $t->column('perm', 'integer', array('null' => false));
             $t->end();
 
-            $this->addIndex('kronolith_shares_groups', 'share_id');
-            $this->addIndex('kronolith_shares_groups', 'group_uid');
-            $this->addIndex('kronolith_shares_groups', 'perm');
+            $this->addIndex('kronolith_shares_groups', array('share_id'));
+            $this->addIndex('kronolith_shares_groups', array('group_uid'));
+            $this->addIndex('kronolith_shares_groups', array('perm'));
         }
 
         if (!in_array('kronolith_shares_users', $tableList)) {
@@ -104,9 +104,9 @@ class KronolithBaseTables extends Horde_Db_Migration_Base
             $t->column('perm', 'integer', array('null' => false));
             $t->end();
 
-            $this->addIndex('kronolith_shares_users', 'share_id');
-            $this->addIndex('kronolith_shares_users', 'user_uid');
-            $this->addIndex('kronolith_shares_users', 'perm');
+            $this->addIndex('kronolith_shares_users', array('share_id'));
+            $this->addIndex('kronolith_shares_users', array('user_uid'));
+            $this->addIndex('kronolith_shares_users', array('perm'));
         }
     }
 
diff --git a/kronolith/migration/6_kronolith_upgrade_addresources.php b/kronolith/migration/6_kronolith_upgrade_addresources.php
index aeceae5bb..2b8d88745 100644
--- a/kronolith/migration/6_kronolith_upgrade_addresources.php
+++ b/kronolith/migration/6_kronolith_upgrade_addresources.php
@@ -32,8 +32,8 @@ class KronolithUpgradeAddResources extends Horde_Db_Migration_Base
             $t->primaryKey(array('resource_id'));
             $t->end();
 
-            $this->addIndex('kronolith_resources', 'resource_calendar');
-            $this->addIndex('kronolith_resources', 'resource_type');
+            $this->addIndex('kronolith_resources', array('resource_calendar'));
+            $this->addIndex('kronolith_resources', array('resource_type'));
         }
     }
 
diff --git a/mnemo/migration/1_mnemo_base_tables.php b/mnemo/migration/1_mnemo_base_tables.php
index 1a30612f8..1deed639b 100644
--- a/mnemo/migration/1_mnemo_base_tables.php
+++ b/mnemo/migration/1_mnemo_base_tables.php
@@ -33,8 +33,8 @@ class MnemoBaseTables extends Horde_Db_Migration_Base
             $t->primaryKey(array('memo_owner', 'memo_id'));
             $t->end();
 
-            $this->addIndex('mnemo_memos', 'memo_owner');
-            $this->addIndex('mnemo_memos', 'memo_uid');
+            $this->addIndex('mnemo_memos', array('memo_owner'));
+            $this->addIndex('mnemo_memos', array('memo_uid'));
         }
 
         if (!in_array('mnemo_shares', $tableList)) {
@@ -50,11 +50,11 @@ class MnemoBaseTables extends Horde_Db_Migration_Base
             $t->column('attribute_desc', 'string', array('limit' => 255));
             $t->primaryKey(array('share_id'));
             $t->end();
-            $this->addIndex('mnemo_shares', 'share_name');
-            $this->addIndex('mnemo_shares', 'share_owner');
-            $this->addIndex('mnemo_shares', 'perm_creator');
-            $this->addIndex('mnemo_shares', 'perm_default');
-            $this->addIndex('mnemo_shares', 'perm_guest');
+            $this->addIndex('mnemo_shares', array('share_name'));
+            $this->addIndex('mnemo_shares', array('share_owner'));
+            $this->addIndex('mnemo_shares', array('perm_creator'));
+            $this->addIndex('mnemo_shares', array('perm_default'));
+            $this->addIndex('mnemo_shares', array('perm_guest'));
         }
 
         if (!in_array('mnemo_shares_groups', $tableList)) {
@@ -64,9 +64,9 @@ class MnemoBaseTables extends Horde_Db_Migration_Base
             $t->column('perm', 'integer', array('null' => false));
             $t->end();
 
-            $this->addIndex('mnemo_shares_groups', 'share_id');
-            $this->addIndex('mnemo_shares_groups', 'group_uid');
-            $this->addIndex('mnemo_shares_groups', 'perm');
+            $this->addIndex('mnemo_shares_groups', array('share_id'));
+            $this->addIndex('mnemo_shares_groups', array('group_uid'));
+            $this->addIndex('mnemo_shares_groups', array('perm'));
         }
 
         if (!in_array('mnemo_shares_users', $tableList)) {
@@ -76,9 +76,9 @@ class MnemoBaseTables extends Horde_Db_Migration_Base
             $t->column('perm', 'integer', array('null' => false));
             $t->end();
 
-            $this->addIndex('mnemo_shares_users', 'share_id');
-            $this->addIndex('mnemo_shares_users', 'user_uid');
-            $this->addIndex('mnemo_shares_users', 'perm');
+            $this->addIndex('mnemo_shares_users', array('share_id'));
+            $this->addIndex('mnemo_shares_users', array('user_uid'));
+            $this->addIndex('mnemo_shares_users', array('perm'));
         }
     }
 
diff --git a/nag/migration/1_nag_base_tables.php b/nag/migration/1_nag_base_tables.php
index db8b06832..1266471d5 100644
--- a/nag/migration/1_nag_base_tables.php
+++ b/nag/migration/1_nag_base_tables.php
@@ -44,9 +44,9 @@ class NagBaseTables extends Horde_Db_Migration_Base
             $t->primaryKey(array('task_id'));
             $t->end();
 
-            $this->addIndex('nag_tasks', 'task_owner');
-            $this->addIndex('nag_tasks', 'task_uid');
-            $this->addIndex('nag_tasks', 'task_start');
+            $this->addIndex('nag_tasks', array('task_owner'));
+            $this->addIndex('nag_tasks', array('task_uid'));
+            $this->addIndex('nag_tasks', array('task_start'));
         }
 
         if (!in_array('nag_shares', $tableList)) {
@@ -64,11 +64,11 @@ class NagBaseTables extends Horde_Db_Migration_Base
             $t->primaryKey(array('share_id'));
             $t->end();
 
-            $this->addIndex('nag_shares', 'share_name');
-            $this->addIndex('nag_shares', 'share_owner');
-            $this->addIndex('nag_shares', 'perm_creator');
-            $this->addIndex('nag_shares', 'perm_default');
-            $this->addIndex('nag_shares', 'perm_guest');
+            $this->addIndex('nag_shares', array('share_name'));
+            $this->addIndex('nag_shares', array('share_owner'));
+            $this->addIndex('nag_shares', array('perm_creator'));
+            $this->addIndex('nag_shares', array('perm_default'));
+            $this->addIndex('nag_shares', array('perm_guest'));
         }
 
         if (!in_array('nag_shares_groups', $tableList)) {
@@ -78,9 +78,9 @@ class NagBaseTables extends Horde_Db_Migration_Base
             $t->column('perm', 'integer', array('limit' => 2, 'null' => false));
             $t->end();
 
-            $this->addIndex('nag_shares_groups', 'share_id');
-            $this->addIndex('nag_shares_groups', 'group_uid');
-            $this->addIndex('nag_shares_groups', 'perm');
+            $this->addIndex('nag_shares_groups', array('share_id'));
+            $this->addIndex('nag_shares_groups', array('group_uid'));
+            $this->addIndex('nag_shares_groups', array('perm'));
         }
 
         if (!in_array('nag_shares_users', $tableList)) {
@@ -90,9 +90,9 @@ class NagBaseTables extends Horde_Db_Migration_Base
             $t->column('perm', 'integer', array('limit' => 2, 'null' => false));
             $t->end();
 
-            $this->addIndex('nag_shares_users', 'share_id');
-            $this->addIndex('nag_shares_users', 'user_uid');
-            $this->addIndex('nag_shares_users', 'perm');
+            $this->addIndex('nag_shares_users', array('share_id'));
+            $this->addIndex('nag_shares_users', array('user_uid'));
+            $this->addIndex('nag_shares_users', array('perm'));
         }
     }
 
diff --git a/turba/migration/1_turba_base_tables.php b/turba/migration/1_turba_base_tables.php
index fce2b2035..375b8d7e5 100644
--- a/turba/migration/1_turba_base_tables.php
+++ b/turba/migration/1_turba_base_tables.php
@@ -93,11 +93,11 @@ class TurbaBaseTables extends Horde_Db_Migration_Base
             $t->primaryKey(array('share_id'));
             $t->end();
 
-            $this->addIndex('turba_shares', 'share_name');
-            $this->addIndex('turba_shares', 'share_owner');
-            $this->addIndex('turba_shares', 'perm_creator');
-            $this->addIndex('turba_shares', 'perm_default');
-            $this->addIndex('turba_shares', 'perm_guest');
+            $this->addIndex('turba_shares', array('share_name'));
+            $this->addIndex('turba_shares', array('share_owner'));
+            $this->addIndex('turba_shares', array('perm_creator'));
+            $this->addIndex('turba_shares', array('perm_default'));
+            $this->addIndex('turba_shares', array('perm_guest'));
         }
 
         if (!in_array('turba_shares_groups', $tableList)) {
@@ -107,9 +107,9 @@ class TurbaBaseTables extends Horde_Db_Migration_Base
             $t->column('perm', 'integer', array('null' => false));
             $t->end();
 
-            $this->addIndex('turba_shares_groups', 'share_id');
-            $this->addIndex('turba_shares_groups', 'group_uid');
-            $this->addIndex('turba_shares_groups', 'perm');
+            $this->addIndex('turba_shares_groups', array('share_id'));
+            $this->addIndex('turba_shares_groups', array('group_uid'));
+            $this->addIndex('turba_shares_groups', array('perm'));
         }
 
         if (!in_array('turba_shares_users', $tableList)) {
@@ -120,9 +120,9 @@ class TurbaBaseTables extends Horde_Db_Migration_Base
             $t->column('perm', 'integer', array('null' => false));
             $t->end();
 
-            $this->addIndex('turba_shares_users', 'share_id');
-            $this->addIndex('turba_shares_users', 'user_uid');
-            $this->addIndex('turba_shares_users', 'perm');
+            $this->addIndex('turba_shares_users', array('share_id'));
+            $this->addIndex('turba_shares_users', array('user_uid'));
+            $this->addIndex('turba_shares_users', array('perm'));
         }
     }