From: Jan Schneider Date: Mon, 24 Jan 2011 17:58:58 +0000 (+0100) Subject: More user_uid column fixes. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d24b0552c15cf93589349bc8f0761428419f236a;p=horde.git More user_uid column fixes. --- diff --git a/ansel/migration/1_ansel_base_tables.php b/ansel/migration/1_ansel_base_tables.php index 482cc6ce7..1eb3a48f7 100644 --- a/ansel/migration/1_ansel_base_tables.php +++ b/ansel/migration/1_ansel_base_tables.php @@ -146,7 +146,7 @@ class AnselBaseTables extends Horde_Db_Migration_Base // Create: ansel_shares_users $t = $this->createTable('ansel_shares_users'); $t->column('share_id', 'integer', array('null' => false)); - $t->column('user_uid', 'integer', array('null' => false)); + $t->column('user_uid', 'integer', array('limit' => 255, 'null' => false)); $t->column('perm', 'integer', array('null' => false)); $t->end(); diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES index b6297aaf6..e78f92382 100644 --- a/horde/docs/CHANGES +++ b/horde/docs/CHANGES @@ -2,7 +2,7 @@ v4.0-cvs -------- -[jan] Add a new Share SQL driver with magnitudes better performance. +[jan] Add a new Share SQL driver with better performance. [mms] Update prototypejs to v1.7. [mms] Add theme caching. [mms] Add hook to allow browser capabilities to be modified. diff --git a/ingo/migration/3_ingo_upgrade_sqlng.php b/ingo/migration/3_ingo_upgrade_sqlng.php index 0f9c35dce..546d246a8 100644 --- a/ingo/migration/3_ingo_upgrade_sqlng.php +++ b/ingo/migration/3_ingo_upgrade_sqlng.php @@ -72,7 +72,7 @@ class IngoUpgradeSqlng extends Horde_Db_Migration_Base $t = $this->createTable('ingo_sharesng_users', array('primaryKey' => false)); $t->column('share_id', 'integer', array('null' => false)); - $t->column('user_uid', 'string', array('limit' => 255)); + $t->column('user_uid', 'string', array('limit' => 255, 'null' => false)); $t->column('perm_' . Horde_Perms::SHOW, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::READ, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::EDIT, 'boolean', array('default' => false, 'null' => false)); diff --git a/kronolith/migration/15_kronolith_upgrade_sqlng.php b/kronolith/migration/15_kronolith_upgrade_sqlng.php index be7b787e8..956336ff7 100644 --- a/kronolith/migration/15_kronolith_upgrade_sqlng.php +++ b/kronolith/migration/15_kronolith_upgrade_sqlng.php @@ -90,7 +90,7 @@ class KronolithUpgradeSqlng extends Horde_Db_Migration_Base $t = $this->createTable('kronolith_sharesng_users', array('primaryKey' => false)); $t->column('share_id', 'integer', array('null' => false)); - $t->column('user_uid', 'string', array('limit' => 255)); + $t->column('user_uid', 'string', array('limit' => 255, 'null' => false)); $t->column('perm_' . Horde_Perms::SHOW, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::READ, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::EDIT, 'boolean', array('default' => false, 'null' => false)); diff --git a/mnemo/migration/3_mnemo_upgrade_sqlng.php b/mnemo/migration/3_mnemo_upgrade_sqlng.php index 0c1a202e0..6cb4a651b 100644 --- a/mnemo/migration/3_mnemo_upgrade_sqlng.php +++ b/mnemo/migration/3_mnemo_upgrade_sqlng.php @@ -72,7 +72,7 @@ class MnemoUpgradeSqlng extends Horde_Db_Migration_Base $t = $this->createTable('mnemo_sharesng_users', array('primaryKey' => false)); $t->column('share_id', 'integer', array('null' => false)); - $t->column('user_uid', 'string', array('limit' => 255)); + $t->column('user_uid', 'string', array('limit' => 255, 'null' => false)); $t->column('perm_' . Horde_Perms::SHOW, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::READ, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::EDIT, 'boolean', array('default' => false, 'null' => false)); diff --git a/nag/migration/1_nag_base_tables.php b/nag/migration/1_nag_base_tables.php index 07ab1ce17..087fe3be2 100644 --- a/nag/migration/1_nag_base_tables.php +++ b/nag/migration/1_nag_base_tables.php @@ -86,7 +86,7 @@ class NagBaseTables extends Horde_Db_Migration_Base if (!in_array('nag_shares_users', $tableList)) { $t = $this->createTable('nag_shares_users', array('primaryKey' => false)); $t->column('share_id', 'integer', array('null' => false)); - $t->column('user_uid', 'string', array('null' => false, 'null' => false)); + $t->column('user_uid', 'string', array('limit' => 255, 'null' => false)); $t->column('perm', 'integer', array('limit' => 2, 'null' => false)); $t->end(); diff --git a/nag/migration/6_nag_upgrade_sqlng.php b/nag/migration/6_nag_upgrade_sqlng.php index 6c1af8f64..c4288d71e 100644 --- a/nag/migration/6_nag_upgrade_sqlng.php +++ b/nag/migration/6_nag_upgrade_sqlng.php @@ -73,7 +73,7 @@ class NagUpgradeSqlng extends Horde_Db_Migration_Base $t = $this->createTable('nag_sharesng_users', array('primaryKey' => false)); $t->column('share_id', 'integer', array('null' => false)); - $t->column('user_uid', 'string', array('limit' => 255)); + $t->column('user_uid', 'string', array('limit' => 255, 'null' => false)); $t->column('perm_' . Horde_Perms::SHOW, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::READ, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::EDIT, 'boolean', array('default' => false, 'null' => false)); diff --git a/turba/migration/3_turba_upgrade_sqlng.php b/turba/migration/3_turba_upgrade_sqlng.php index f1f6cfbf2..0ddafb4dd 100644 --- a/turba/migration/3_turba_upgrade_sqlng.php +++ b/turba/migration/3_turba_upgrade_sqlng.php @@ -73,7 +73,7 @@ class TurbaUpgradeSqlng extends Horde_Db_Migration_Base $t = $this->createTable('turba_sharesng_users', array('primaryKey' => false)); $t->column('share_id', 'integer', array('null' => false)); - $t->column('user_uid', 'string', array('limit' => 255)); + $t->column('user_uid', 'string', array('limit' => 255, 'null' => false)); $t->column('perm_' . Horde_Perms::SHOW, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::READ, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::EDIT, 'boolean', array('default' => false, 'null' => false)); diff --git a/whups/migration/3_whups_upgrade_sqlng.php b/whups/migration/3_whups_upgrade_sqlng.php index 494aa4a81..0870e07d4 100644 --- a/whups/migration/3_whups_upgrade_sqlng.php +++ b/whups/migration/3_whups_upgrade_sqlng.php @@ -72,7 +72,7 @@ class WhupsUpgradeSqlng extends Horde_Db_Migration_Base $t = $this->createTable('whups_sharesng_users', array('primaryKey' => false)); $t->column('share_id', 'integer', array('null' => false)); - $t->column('user_uid', 'string', array('limit' => 255)); + $t->column('user_uid', 'string', array('limit' => 255, 'null' => false)); $t->column('perm_' . Horde_Perms::SHOW, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::READ, 'boolean', array('default' => false, 'null' => false)); $t->column('perm_' . Horde_Perms::EDIT, 'boolean', array('default' => false, 'null' => false));