diff options
| author | Nick Palmer <nick@sluggardy.net> | 2010-04-19 15:01:35 +0000 |
|---|---|---|
| committer | Nick Palmer <nick@sluggardy.net> | 2010-04-19 15:01:35 +0000 |
| commit | ac60db7af911019e80c7879235fe9a448fb35848 (patch) | |
| tree | 2b40aca5c341c833091a19cf360fa089ebf0ac58 /admin | |
| parent | 7a70ffb3d668d08879734f27738ce25138fe6555 (diff) | |
| download | liberty-ac60db7af911019e80c7879235fe9a448fb35848.tar.gz liberty-ac60db7af911019e80c7879235fe9a448fb35848.tar.bz2 liberty-ac60db7af911019e80c7879235fe9a448fb35848.zip | |
Can't have a NOT NULL on an unpopulated column. Add it without, copy and then add the constraint.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/upgrades/2.1.4.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/admin/upgrades/2.1.4.php b/admin/upgrades/2.1.4.php index 93ef718..9d75501 100644 --- a/admin/upgrades/2.1.4.php +++ b/admin/upgrades/2.1.4.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_liberty/admin/upgrades/2.1.4.php,v 1.2 2010/04/18 08:18:02 lsces Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_liberty/admin/upgrades/2.1.4.php,v 1.3 2010/04/19 15:01:35 nickpalmer Exp $ */ global $gBitInstaller; @@ -17,7 +17,7 @@ array( 'DATADICT' => array( // insert new column array( 'ALTER' => array( 'liberty_content_types' => array( - 'content_name' => array( '`content_name`', 'VARCHAR(250) NOT NULL' ), + 'content_name' => array( '`content_name`', 'VARCHAR(250)' ), 'content_name_plural' => array( '`content_name_plural`', 'VARCHAR(250)' ), ))), )), @@ -25,7 +25,8 @@ array( 'DATADICT' => array( // copy data into new column array( 'QUERY' => array( - 'SQL92' => array( "UPDATE `".BIT_DB_PREFIX."liberty_content_types` SET `content_name` = `content_description`" ), + 'SQL92' => array( "UPDATE `".BIT_DB_PREFIX."liberty_content_types` SET `content_name` = `content_description`", + "ALTER TABLE `".BIT_DB_PREFIX."liberty_content_types ADD CONSTRAINT content_name_not_null CHECK(content_name IS NOT NULL)" ), ), ), |