[svn r22119] to prepare the connection of wiki and wiki_conf

main/inc/lib/add_course.lib.inc.php

@@ -892,24 +892,27 @@ function update_Db_course($courseDbName)
 		user_ip varchar(39) NOT NULL,		
 		PRIMARY KEY (id),
 		KEY reflink (reflink),
-		KEY group_id (group_id)
+		KEY group_id (group_id),
+		KEY page_id (page_id)
 		)";
 	api_sql_query($sql, __FILE__, __LINE__);
 		
 	//
 	$sql = "CREATE TABLE `".$TABLEWIKICONF . "` (
-		id int NOT NULL auto_increment,
 		page_id int NOT NULL default 0,		
 		feedback1 text NOT NULL,
 		feedback2 text NOT NULL,
 		feedback3 text NOT NULL,
+		fprogress1 varchar(3) NOT NULL,
+		fprogress2 varchar(3) NOT NULL,
+		fprogress3 varchar(3) NOT NULL,
 		max_size int default NULL,
 		max_text int default NULL,
 		max_version int default NULL,
 		startdate_assig datetime NOT NULL default '0000-00-00 00:00:00',
 		enddate_assig datetime  NOT NULL default '0000-00-00 00:00:00',
 		delayedsubmit int NOT NULL default 0,
-		PRIMARY KEY (id)
+		KEY page_id (page_id)
 		)";	
 	api_sql_query($sql, __FILE__, __LINE__);
 	

main/install/migrate-db-1.8.6-1.8.6.1-pre.sql

@@ -22,4 +22,5 @@ ALTER TABLE language ADD INDEX idx_dokeos_folder(dokeos_folder);
 -- xxUSERxx
 
 -- xxCOURSExx
-ALTER TABLE wiki CHANGE title title varchar(255), CHANGE reflink reflink varchar(255), ADD time_edit datetime NOT NULL default '0000-00-00 00:00:00' AFTER is_editing, ADD INDEX (title), ADD INDEX (reflink), ADD INDEX (group_id);
+ALTER TABLE wiki CHANGE title title varchar(255), CHANGE reflink reflink varchar(255), ADD time_edit datetime NOT NULL default '0000-00-00 00:00:00' AFTER is_editing, ADD INDEX (title), ADD INDEX (reflink), ADD INDEX (group_id), ADD INDEX (page_id);
+ALTER TABLE wiki_conf DROP id, ADD fprogress3 varchar(3) NOT NULL AFTER feedback3, ADD fprogress2 varchar(3) NOT NULL AFTER feedback3, ADD fprogress1 varchar(3) NOT NULL AFTER feedback3, ADD INDEX(page_id);