Browse Source

Adding primary keys see #4682

Julio Montoya 12 years ago
parent
commit
384bf36a3f
2 changed files with 20 additions and 8 deletions
  1. 9 3
      main/install/db_main.sql
  2. 11 5
      main/install/migrate-db-1.8.8-1.9.0-pre.sql

+ 9 - 3
main/install/db_main.sql

@@ -70,6 +70,7 @@ UNLOCK TABLES;
 
 DROP TABLE IF EXISTS admin;
 CREATE TABLE IF NOT EXISTS admin (
+  id  INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
   user_id int unsigned NOT NULL default '0',
   UNIQUE KEY user_id (user_id)
 );
@@ -869,7 +870,7 @@ VALUES
 ('activate_email_template', NULL, 'radio', 'Platform', 'false', 'ActivateEmailTemplateTitle', 'ActivateEmailTemplateComment', NULL, NULL, 0),
 ('enable_iframe_inclusion', NULL, 'radio', 'Editor', 'false', 'EnableIframeInclusionTitle', 'EnableIframeInclusionComment', NULL, NULL, 1),
 ('show_hot_courses', NULL, 'radio', 'Platform', 'true', 'ShowHotCoursesTitle', 'ShowHotCoursesComment', NULL, NULL, 1),
-('chamilo_database_version', NULL, 'textfield',NULL, '1.9.0.18163','DatabaseVersion','', NULL, NULL, 0);
+('chamilo_database_version', NULL, 'textfield',NULL, '1.9.0.18188','DatabaseVersion','', NULL, NULL, 0);
 
 
 /*
@@ -2796,18 +2797,21 @@ CREATE TABLE IF NOT EXISTS usergroup (
 
 DROP TABLE IF EXISTS usergroup_rel_user;
 CREATE TABLE IF NOT EXISTS usergroup_rel_user    (
+    id 			INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
     usergroup_id INT NOT NULL,
     user_id 	INT NOT NULL
 );
 
 DROP TABLE IF EXISTS usergroup_rel_course;
 CREATE TABLE IF NOT EXISTS usergroup_rel_course  (
+    id 			INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
     usergroup_id INT NOT NULL,
     course_id 	INT NOT NULL
 );
 
 DROP TABLE IF EXISTS usergroup_rel_session;
 CREATE TABLE IF NOT EXISTS usergroup_rel_session (
+    id 			INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
     usergroup_id INT NOT NULL,
     session_id  INT NOT NULL
 );
@@ -2858,13 +2862,15 @@ CREATE TABLE IF NOT EXISTS skill_rel_gradebook (
 
 DROP TABLE IF EXISTS skill_rel_skill;
 CREATE TABLE IF NOT EXISTS skill_rel_skill (
+  id int NOT NULL AUTO_INCREMENT,
   skill_id int NOT NULL,
   parent_id int NOT NULL,
   relation_type int NOT NULL,
-  level int NOT NULL
+  level int NOT NULL,
+  PRIMARY KEY (id)
 );
 
-INSERT INTO skill_rel_skill VALUES(1, 0, 0, 0);
+INSERT INTO skill_rel_skill VALUES(1, 1, 0, 0, 0);
 
 DROP TABLE IF EXISTS skill_rel_user;
 CREATE TABLE IF NOT EXISTS skill_rel_user (

+ 11 - 5
main/install/migrate-db-1.8.8-1.9.0-pre.sql

@@ -237,8 +237,8 @@ CREATE TABLE IF NOT EXISTS skill ( id int NOT NULL AUTO_INCREMENT, name varchar(
 INSERT INTO skill (name) VALUES ('Root');
 
 CREATE TABLE IF NOT EXISTS skill_rel_gradebook ( id int NOT NULL AUTO_INCREMENT, gradebook_id int NOT NULL, skill_id int NOT NULL, type varchar(10) NOT NULL, PRIMARY KEY (id));
-CREATE TABLE IF NOT EXISTS skill_rel_skill ( skill_id int NOT NULL, parent_id int NOT NULL, relation_type int NOT NULL, level int NOT NULL);
-INSERT INTO skill_rel_skill VALUES(1, 0, 0, 0);
+CREATE TABLE IF NOT EXISTS skill_rel_skill (id int NOT NULL AUTO_INCREMENT, skill_id int NOT NULL, parent_id int NOT NULL, relation_type int NOT NULL, level int NOT NULL, PRIMARY KEY (id));
+INSERT INTO skill_rel_skill VALUES(1, 1, 0, 0, 0);
 
 CREATE TABLE IF NOT EXISTS skill_rel_user ( id int NOT NULL AUTO_INCREMENT, user_id int NOT NULL, skill_id int NOT NULL, acquired_skill_at datetime NOT NULL DEFAULT '0000-00-00 00:00:00',assigned_by int NOT NULL,PRIMARY KEY (id));
 CREATE TABLE IF NOT EXISTS skill_profile ( id INTEGER  NOT NULL AUTO_INCREMENT, name VARCHAR(255)  NOT NULL, description TEXT  NOT NULL, PRIMARY KEY (id));
@@ -260,8 +260,15 @@ INSERT INTO settings_options (variable, value, display_text) values ('platform_u
 
 DROP TABLE IF EXISTS access_url_rel_session;
 
+ALTER TABLE usergroup_rel_session   ADD COLUMN id INTEGER NOT NULL AUTO_INCREMENT, ADD PRIMARY KEY (id);
+ALTER TABLE usergroup_rel_course    ADD COLUMN id INTEGER NOT NULL AUTO_INCREMENT, ADD PRIMARY KEY (id);
+ALTER TABLE usergroup_rel_user      ADD COLUMN id INTEGER NOT NULL AUTO_INCREMENT, ADD PRIMARY KEY (id);
+ALTER TABLE admin                   ADD COLUMN id INTEGER NOT NULL AUTO_INCREMENT, ADD PRIMARY KEY (id);
+
+
+
 -- Do not move this query
-UPDATE settings_current SET selected_value = '1.9.0.18163' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.9.0.18188' WHERE variable = 'chamilo_database_version';
 
 -- xxSTATSxx
 ALTER TABLE track_e_exercices ADD COLUMN questions_to_check TEXT NOT NULL DEFAULT '';
@@ -296,5 +303,4 @@ ALTER TABLE user_api_key ADD COLUMN api_end_point text DEFAULT NULL;
 ALTER TABLE user_api_key ADD COLUMN created_date datetime DEFAULT NULL;
 ALTER TABLE user_api_key ADD COLUMN validity_start_date datetime DEFAULT NULL;
 ALTER TABLE user_api_key ADD COLUMN validity_end_date datetime DEFAULT NULL;
-ALTER TABLE user_api_key ADD COLUMN description text DEFAULT NULL;
-
+ALTER TABLE user_api_key ADD COLUMN description text DEFAULT NULL;