diff options
| author | Christian Fowler <spider@viovio.com> | 2007-09-27 15:39:04 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2007-09-27 15:39:04 +0000 |
| commit | f4d7193ee350c1c479787f8296135f870781da71 (patch) | |
| tree | 69bd31286adf65179f58001b268e42686bc1aa63 /admin | |
| parent | 1b4f2b83c10343cfffb7561f8020706259f982a8 (diff) | |
| download | liberty-f4d7193ee350c1c479787f8296135f870781da71.tar.gz liberty-f4d7193ee350c1c479787f8296135f870781da71.tar.bz2 liberty-f4d7193ee350c1c479787f8296135f870781da71.zip | |
SCHEMA CHANGE: tweak liberty_content_history.description C(200) to .summary X, and add code to store current summary in history table, also remove Affected_Rows calls since behavior is inconsistent to non-existent across DB's, update upgrade to migrate history descritpion to new summary column.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/schema_inc.php | 2 | ||||
| -rw-r--r-- | admin/upgrade_inc.php | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index 6f37cb2..f34abb7 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -64,7 +64,7 @@ $tables = array( version I4 PRIMARY, last_modified I8 NOTNULL, format_guid C(16) NOTNULL, - description C(200), + summary X, user_id C(40), ip C(15), history_comment C(200), diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index a4de993..4ce4f3b 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -106,9 +106,6 @@ array( 'DATADICT' => array( 'object_id' => array( '`content_id`', 'I4' ), 'is_revoked' => array( '`is_revoked`', 'VARCHAR(1)' ), ), - 'liberty_content_history' => array( - 'summary' => array( '`summary`', 'X' ) - ), )), /* The installer can't add constraints after table creation yet so drop this constraint. array( 'SQL' => array( @@ -290,6 +287,7 @@ array( 'DATADICT' => array( array( 'ALTER' => array ( 'liberty_content_history' => array( 'content_id' => array( '`content_id`', 'I4' ), + 'summary' => array( '`summary`', 'X' ), ), 'liberty_content' => array( 'version' => array( '`version`', 'I4' ), @@ -300,13 +298,14 @@ array( 'DATADICT' => array( array( 'QUERY' => array( 'SQL92' => array( "UPDATE `".BIT_DB_PREFIX."liberty_content_history` SET `content_id`=(SELECT `content_id` FROM `".BIT_DB_PREFIX."tiki_pages` wp WHERE wp.`page_id`=`".BIT_DB_PREFIX."liberty_content_history`.`page_id`)", - "UPDATE `".BIT_DB_PREFIX."liberty_content` SET version=(SELECT `version` from `".BIT_DB_PREFIX."tiki_pages` wp WHERE wp.`content_id`=`".BIT_DB_PREFIX."liberty_content`.`content_id`)" + "UPDATE `".BIT_DB_PREFIX."liberty_content` SET version=(SELECT `version` from `".BIT_DB_PREFIX."tiki_pages` wp WHERE wp.`content_id`=`".BIT_DB_PREFIX."liberty_content`.`content_id`)", + "UPDATE `".BIT_DB_PREFIX."liberty_content_history` SET `summary`=`decription`", )), ), array( 'DATADICT' => array( array( 'DROPCOLUMN' => array( - 'liberty_content_history' => array( '`page_id`' ), + 'liberty_content_history' => array( '`page_id`', '`description`' ), 'tiki_pages' => array( '`version`' ), )), )), @@ -596,7 +595,7 @@ array( 'DATADICT' => array( )), array( 'QUERY' => array( 'SQL92' => array( - "UPDATE `".BIT_DB_PREFIX."liberty_action_log` SET `content_id`=( SELECT `content_id` FROM `".BIT_DB_PREFIX."tiki_pages` tp WHERE tp.`page_id`=`".BIT_DB_PREFIX."liberty_action_log`.`page_id` )" + "UPDATE `".BIT_DB_PREFIX."liberty_action_log` SET `content_id`=( SELECT `content_id` FROM `".BIT_DB_PREFIX."tiki_pages` tp WHERE tp.`page_id`=`".BIT_DB_PREFIX."liberty_action_log`.`page_id` )", )), ), array( 'DATADICT' => array( |