Browse Source

[svn r17977] minor-modified scripts sql - (see FS#3518)

Isaac Flores 16 years ago
parent
commit
eddb6022f2
2 changed files with 14 additions and 15 deletions
  1. 5 5
      main/inc/lib/add_course.lib.inc.php
  2. 9 10
      main/install/migrate-db-1.8.5-1.8.6-pre.sql

+ 5 - 5
main/inc/lib/add_course.lib.inc.php

@@ -800,12 +800,12 @@ function update_Db_course($courseDbName)
 		post_group_id int DEFAULT 0 NOT NULL,
 		sent_date datetime NOT NULL default '0000-00-00 00:00:00',
 		filetype set('file','folder') NOT NULL default 'file',
-		has_properties int,
-		view_properties tinyint,
-		qualification INT UNSIGNED NOT NULL,
+		has_properties int UNSIGNED NOT NULL DEFAULT 0,
+		view_properties tinyint NULL,
+		qualification INT UNSIGNED NOT NULL DEFAULT 0,
  		date_of_qualification datetime NOT NULL default '0000-00-00 00:00:00',
- 		parent_id INT UNSIGNED NOT NULL,
-		qualificator_id INT UNSIGNED NOT NULL,
+ 		parent_id INT UNSIGNED NOT NULL DEFAULT 0,
+		qualificator_id INT UNSIGNED NOT NULL DEFAULT 0,
 		session_id INT UNSIGNED NOT NULL default 0,
 		PRIMARY KEY (id)
 		)";

+ 9 - 10
main/install/migrate-db-1.8.5-1.8.6-pre.sql

@@ -139,14 +139,14 @@ ALTER TABLE lp_item ADD search_did INT NULL;
 CREATE TABLE wiki (id int NOT NULL auto_increment, page_id int NOT NULL default 0, reflink varchar(250) NOT NULL default 'index', title text NOT NULL, content mediumtext NOT NULL, user_id int NOT NULL default 0, group_id int default NULL, dtime datetime NOT NULL default '0000-00-00 00:00:00', addlock int NOT NULL default 1, editlock int NOT NULL default 0, visibility int NOT NULL default 1, addlock_disc int NOT NULL default 1, visibility_disc int NOT NULL default 1, ratinglock_disc int NOT NULL default 1, assignment int NOT NULL default 0, comment text NOT NULL, progress text NOT NULL, score int default 0, version int default NULL, is_editing int NOT NULL default 0, hits int default 0, linksto text NOT NULL, tag text NOT NULL, user_ip varchar(39) NOT NULL, PRIMARY KEY  (id) );
 INSERT INTO tool(name,link,image,visibility,admin,address,added_tool,target,category) VALUES ('wiki','wiki/index.php','wiki.gif',0,'0','squaregrey.gif',0,'_self','interaction');
 ALTER TABLE group_category ADD COLUMN wiki_state tinyint unsigned NOT NULL default 1;
-ALTER TABLE group_info ADD COLUMN wiki_state enum('0','1','2') NOT NULL default '0';
-ALTER TABLE announcement ADD session_id SMALLINT UNSIGNED NOT NULL;
+ALTER TABLE group_info ADD COLUMN wiki_state tinyint unsigned NOT NULL default 1;
+ALTER TABLE announcement ADD session_id SMALLINT UNSIGNED NOT NULL default 0;
 ALTER TABLE announcement ADD INDEX ( session_id ) ;
-ALTER TABLE forum_category ADD session_id SMALLINT UNSIGNED NOT NULL ;
+ALTER TABLE forum_category ADD session_id SMALLINT UNSIGNED NOT NULL default 0;
 ALTER TABLE forum_category ADD INDEX ( session_id ) ;
 ALTER TABLE student_publication ADD session_id SMALLINT UNSIGNED NOT NULL default 0 ;
 ALTER TABLE student_publication ADD INDEX ( session_id ) ;
-ALTER TABLE calendar_event ADD session_id SMALLINT UNSIGNED NOT NULL default 0 ;
+ALTER TABLE calendar_event ADD session_id int unsigned NOT NULL default 0 ;
 ALTER TABLE calendar_event ADD INDEX ( session_id ) ;
 ALTER TABLE group_info ADD session_id SMALLINT UNSIGNED NOT NULL DEFAULT 0;
 ALTER TABLE group_info ADD INDEX ( session_id ) ;
@@ -173,17 +173,15 @@ INSERT INTO tool(name,link,image,visibility,admin,address,added_tool,target,cate
 ALTER TABLE forum_thread ADD thread_close_date datetime default '0000-00-00 00:00:00';
 ALTER TABLE student_publication ADD view_properties tinyint NULL;
 UPDATE forum_notification SET forum_id=NULL WHERE forum_id='';
-ALTER TABLE forum_notification CHANGE forum_id forum_id INT NULL;
+ALTER TABLE forum_notification CHANGE forum_id forum_id INT;
 UPDATE forum_notification SET thread_id=NULL WHERE thread_id='';
-ALTER TABLE forum_notification CHANGE thread_id thread_id INT NULL;
+ALTER TABLE forum_notification CHANGE thread_id thread_id INT;
 UPDATE forum_notification SET post_id=NULL WHERE post_id='';
 ALTER TABLE forum_notification CHANGE post_id post_id INT NULL;
 ALTER TABLE forum_thread ADD thread_weight smallint default 0;
-ALTER TABLE forum_notification CHANGE post_id post_id INT NULL;
+ALTER TABLE forum_notification CHANGE post_id post_id INT;
 ALTER TABLE quiz_answer CHANGE hotspot_coordinates hotspot_coordinates text;
-ALTER TABLE group_info ADD forum_state TINYINT NULL AFTER announcements_state;
-CREATE TABLE calendar_event_attachment ( id int NOT NULL auto_increment, path varchar(255) NOT NULL, comment text, size int NOT NULL default 0, agenda_id int NOT NULL, filename varchar(255) NOT NULL, PRIMARY KEY (id) );
-ALTER TABLE glossary ADD display_order int;
+ALTER TABLE group_info ADD forum_state TINYINT unsigned NOT NULL default 0 AFTER announcements_state;
 CREATE TABLE calendar_event_attachment ( id int NOT NULL auto_increment, path varchar(255) NOT NULL, comment text, size int NOT NULL default 0, agenda_id int NOT NULL, filename varchar(255) NOT NULL, PRIMARY KEY (id) );
 CREATE TABLE notebook (notebook_id int unsigned NOT NULL auto_increment,user_id int unsigned NOT NULL,course varchar(40) not null,session_id int NOT NULL default 0,title varchar(255) NOT NULL,description text NOT NULL,creation_date datetime NOT NULL default '0000-00-00 00:00:00',update_date datetime NOT NULL default '0000-00-00 00:00:00', status int, PRIMARY KEY (notebook_id));
 INSERT INTO course_setting(variable,value,category) VALUES ('allow_open_chat_window',0,'chat');
@@ -193,4 +191,5 @@ INSERT INTO tool(name,link,image,visibility,admin,address,added_tool,target,cate
 ALTER TABLE quiz ADD feedback_type int NOT NULL default 0;
 ALTER TABLE quiz_answer ADD destination text NOT NULL;
 CREATE TABLE glossary(glossary_id int unsigned NOT NULL auto_increment, name varchar(255) NOT NULL, description text not null, display_order int, PRIMARY KEY  (glossary_id));
+ALTER TABLE glossary ADD display_order int;
 ALTER TABLE quiz_question ADD level int UNSIGNED NOT NULL default 0;