From bdd85c56a8561e130b442d8bd21f515fd7fe10ad Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 30 Mar 2015 10:18:04 +0200 Subject: [PATCH] Fix error when c_id is not set in track_e_default --- main/install/database.sql | 12 ++++++------ main/install/migrate-db-1.9.0-1.10.0-pre.sql | 8 +++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/main/install/database.sql b/main/install/database.sql index a03c8cd9ed..aaf31dfd36 100644 --- a/main/install/database.sql +++ b/main/install/database.sql @@ -3184,7 +3184,7 @@ DROP TABLE IF EXISTS track_e_access; CREATE TABLE track_e_access ( access_id int NOT NULL auto_increment, access_user_id int unsigned default NULL, - access_date datetime NOT NULL default '0000-00-00 00:00:00', + access_date datetime NOT NULL, c_id int not null, access_tool varchar(30) default NULL, access_session_id int NOT NULL default 0, @@ -3198,7 +3198,7 @@ DROP TABLE IF EXISTS track_e_lastaccess; CREATE TABLE track_e_lastaccess ( access_id bigint NOT NULL auto_increment, access_user_id int unsigned default NULL, - access_date datetime NOT NULL default '0000-00-00 00:00:00', + access_date datetime NOT NULL, c_id int not null, access_tool varchar(30) default NULL, access_session_id int unsigned default NULL, @@ -3212,8 +3212,8 @@ DROP TABLE IF EXISTS track_e_default; CREATE TABLE track_e_default ( default_id int NOT NULL auto_increment, default_user_id int unsigned NOT NULL default 0, - c_id int not null, - default_date datetime NOT NULL default '0000-00-00 00:00:00', + c_id int default NULL, + default_date datetime NOT NULL, default_event_type varchar(20) NOT NULL default '', default_value_type varchar(20) NOT NULL default '', default_value text NOT NULL, @@ -3225,7 +3225,7 @@ DROP TABLE IF EXISTS track_e_downloads; CREATE TABLE track_e_downloads ( down_id int NOT NULL auto_increment, down_user_id int unsigned default NULL, - down_date datetime NOT NULL default '0000-00-00 00:00:00', + down_date datetime NOT NULL, c_id int NOT NULL, down_doc_path varchar(255) NOT NULL default '', down_session_id INT NOT NULL DEFAULT 0, @@ -4727,5 +4727,5 @@ CREATE TABLE c_attendance_calendar_rel_group ( -- Version LOCK TABLES settings_current WRITE; -UPDATE settings_current SET selected_value = '1.10.0.31' WHERE variable = 'chamilo_database_version'; +UPDATE settings_current SET selected_value = '1.10.0.32' WHERE variable = 'chamilo_database_version'; UNLOCK TABLES; diff --git a/main/install/migrate-db-1.9.0-1.10.0-pre.sql b/main/install/migrate-db-1.9.0-1.10.0-pre.sql index 10befbc9c8..c04e1a8c3b 100644 --- a/main/install/migrate-db-1.9.0-1.10.0-pre.sql +++ b/main/install/migrate-db-1.9.0-1.10.0-pre.sql @@ -88,6 +88,11 @@ ALTER TABLE user MODIFY COLUMN registration_date datetime NOT NULL; UPDATE user SET registration_date = NULL WHERE registration_date = '0000-00-00 00:00:00'; UPDATE user SET expiration_date = NULL WHERE expiration_date = '0000-00-00 00:00:00'; +UPDATE track_e_default SET default_date = NULL WHERE default_date = '0000-00-00 00:00:00'; +UPDATE track_e_lastaccess SET access_date = NULL WHERE access_date = '0000-00-00 00:00:00'; +UPDATE track_e_downloads SET down_date = NULL WHERE down_date = '0000-00-00 00:00:00'; +UPDATE track_e_access SET access_date = NULL WHERE access_date = '0000-00-00 00:00:00'; + ALTER TABLE course ADD COLUMN add_teachers_to_sessions_courses tinyint NOT NULL default 0; DELETE FROM settings_options WHERE variable = 'show_glossary_in_extra_tools'; @@ -106,6 +111,7 @@ INSERT INTO settings_options (variable, value, display_text) VALUES ('enabled_ma INSERT INTO settings_options (variable, value, display_text) VALUES ('enabled_mathjax', 'false', 'No'); ALTER TABLE session MODIFY COLUMN name char(100) NOT NULL DEFAULT ''; +ALTER TABLE track_e_default MODIFY COLUMN c_id int default NULL; -- xxCOURSExx @@ -127,4 +133,4 @@ CREATE TABLE IF NOT EXISTS c_attendance_calendar_rel_group (id int NOT NULL auto UPDATE course_field SET field_type = 1 WHERE field_variable = 'special_course'; -- Do not move this query -UPDATE settings_current SET selected_value = '1.10.0.31' WHERE variable = 'chamilo_database_version'; +UPDATE settings_current SET selected_value = '1.10.0.32' WHERE variable = 'chamilo_database_version';