diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2006-01-10 21:19:20 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2006-01-10 21:19:20 +0000 |
| commit | ab2efc4600d5f1c61ebf30a05c0bb0ee09ccc5cc (patch) | |
| tree | 760ed8925d6bbed30eca9069904fcef6a722124e /admin | |
| parent | e142f1af7040016c0d076ba7b7d659b8ec2485f3 (diff) | |
| download | wiki-ab2efc4600d5f1c61ebf30a05c0bb0ee09ccc5cc.tar.gz wiki-ab2efc4600d5f1c61ebf30a05c0bb0ee09ccc5cc.tar.bz2 wiki-ab2efc4600d5f1c61ebf30a05c0bb0ee09ccc5cc.zip | |
merge recent changes into HEAD
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/schema_inc.php | 6 | ||||
| -rw-r--r-- | admin/upgrade_inc.php | 9 |
2 files changed, 0 insertions, 15 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php index b4eb20b..4210e86 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -88,12 +88,6 @@ $tables = array( flag C(1) ", -'tiki_semaphores' => " - sem_name C(250) PRIMARY, - user_id I4 NOTNULL, - created I8 -", - 'tiki_extwiki' => " extwiki_id I4 AUTO PRIMARY, name C(200) NOTNULL, diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index 7bd6369..0ae13a5 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -33,8 +33,6 @@ array( 'RENAMECOLUMN' => array( 'tiki_history' => array( '`lastModif`' => '`last_modified` I8' ), 'tiki_copyrights' => array( '`copyrightId`' => '`copyright_id` I4 AUTO' ), 'tiki_extwiki' => array( '`extwikiId`' => '`extwiki_id` I4 AUTO' ), - 'tiki_semaphores' => array( '`semName`' => '`sem_name` C(250)', - '`timestamp`' => '`created` I8' ), 'tiki_tags' => array( '`tagName`' => '`tag_name` C(80)', '`pageName`' => '`page_name` C(160)', '`lastModif`' => '`last_modified` I8' ), @@ -64,9 +62,6 @@ array( 'ALTER' => array( 'from_content_id' => array( '`from_content_id`', 'I4' ), // , 'NOTNULL' ), 'to_content_id' => array( '`to_content_id`', 'I4' ), // , 'NOTNULL' ), ), - 'tiki_semaphores' => array( - 'user_id' => array( '`user_id`', 'I4' ), // , 'NOTNULL' ), - ), )), )), @@ -122,8 +117,6 @@ array( 'QUERY' => "UPDATE `".BIT_DB_PREFIX."tiki_history` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_history`.`user`)", "UPDATE `".BIT_DB_PREFIX."tiki_history` SET `user_id`=".ROOT_USER_ID." WHERE `user_id` IS NULL", "UPDATE `".BIT_DB_PREFIX."tiki_structures` SET `content_id`= (SELECT `content_id` FROM `".BIT_DB_PREFIX."tiki_pages` tp WHERE tp.`page_id`=`".BIT_DB_PREFIX."tiki_structures`.`page_id`)", - "UPDATE `".BIT_DB_PREFIX."tiki_semaphores` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_semaphores`.`user`)", - "UPDATE `".BIT_DB_PREFIX."tiki_semaphores` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_semaphores`.`user`)", "UPDATE `".BIT_DB_PREFIX."tiki_copyrights` SET `page_id`= (SELECT `page_id` FROM `".BIT_DB_PREFIX."tiki_pages` tp WHERE tp.`pageName`=`".BIT_DB_PREFIX."tiki_copyrights`.`page`)", "UPDATE `".BIT_DB_PREFIX."tiki_copyrights` SET `user_id`=(SELECT `user_id` FROM `".BIT_DB_PREFIX."users_users` WHERE `".BIT_DB_PREFIX."users_users`.`login`=`".BIT_DB_PREFIX."tiki_copyrights`.`userName`)", "UPDATE `".BIT_DB_PREFIX."tiki_copyrights` SET `user_id`=".ROOT_USER_ID." WHERE `user_id` IS NULL", @@ -234,7 +227,6 @@ array( 'PHP' => ' array( 'DATADICT' => array( array( 'DROPCOLUMN' => array( 'tiki_pages' => array( '`lastModif`', '`data`', '`pageName`', '`ip`', '`hits`', '`user`', '`creator`' ), - 'tiki_semaphores' => array( '`user`' ), 'tiki_copyrights' => array( '`userName`', '`page`' ), 'tiki_page_footnotes' => array( '`user`', '`pageName`' ), 'tiki_actionlog' => array( '`user`', '`pageName`' ), @@ -260,7 +252,6 @@ array( 'CREATEINDEX' => array( 'tiki_links_to_idx' => array( 'tiki_links', '`to_content_id`', array() ), 'tiki_links_ft_idx' => array( 'tiki_links', '`from_content_id`,`to_content_id`', array( 'UNIQUE' ) ), 'tiki_pages_content_idx' => array( 'tiki_pages', '`content_id`', array( 'UNIQUE' ) ), - 'tiki_sema_user_idx' => array( 'tiki_semaphores', '`user_id`', array() ), )), )), |