Browse Source

Fixing SQL errors during installation

Julio Montoya 11 years ago
parent
commit
8269669cba

+ 2 - 16
main/install/1.10.0/db_main.sql

@@ -2659,20 +2659,6 @@ CREATE TABLE IF NOT EXISTS user_rel_tag (
     PRIMARY KEY  (id)
 );
 
-
--- DROP TABLE IF EXISTS group_rel_group;
--- CREATE TABLE IF NOT EXISTS group_rel_group (
---	id int NOT NULL AUTO_INCREMENT,
---	group_id int NOT NULL,
---	subgroup_id int NOT NULL,
---	relation_type int NOT NULL,
---	PRIMARY KEY (id)
--- );
-
--- ALTER TABLE group_rel_group ADD INDEX ( group_id );
--- ALTER TABLE group_rel_group ADD INDEX ( subgroup_id );
--- ALTER TABLE group_rel_group ADD INDEX ( relation_type );
-
 DROP TABLE IF EXISTS announcement_rel_group;
 CREATE TABLE IF NOT EXISTS announcement_rel_group (
   id INT unsigned NOT NULL auto_increment,
@@ -3370,7 +3356,7 @@ CREATE TABLE track_e_item_property (
 
 ALTER TABLE track_e_course_access ADD INDEX (user_id);
 ALTER TABLE track_e_course_access ADD INDEX (login_course_date);
-ALTER TABLE track_e_course_access ADD INDEX (course_code);
+ALTER TABLE track_e_course_access ADD INDEX (c_id);
 ALTER TABLE track_e_course_access ADD INDEX (session_id);
 ALTER TABLE track_e_access ADD INDEX (access_session_id);
 
@@ -3527,4 +3513,4 @@ CREATE TABLE ext_log_entries (
 ) DEFAULT CHARSET=utf8;
 
 -- Do not move this
-UPDATE settings_current SET selected_value = '1.10.0.017' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.018' WHERE variable = 'chamilo_database_version';

+ 0 - 1
main/install/1.10.0/migrate-db-1.9.0-1.10.0-post.sql

@@ -33,7 +33,6 @@ ALTER TABLE track_e_downloads DROP COLUMN  down_cours_id;
 
 ALTER TABLE track_e_links DROP COLUMN  links_cours_id;
 
-
 ALTER TABLE session DROP COLUMN date_start;
 ALTER TABLE session DROP COLUMN date_end;
 

+ 1 - 1
main/install/1.10.0/migrate-db-1.9.0-1.10.0-pre.sql

@@ -290,4 +290,4 @@ ALTER TABLE c_quiz ADD COLUMN end_button int NOT NULL default 0;
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('template', NULL, 'text', 'stylesheets', 'default', 'DefaultTemplateTitle', 'DefaultTemplateComment', NULL, NULL, 1);
 
 -- Do not move this
-UPDATE settings_current SET selected_value = '1.10.0.017' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.018' WHERE variable = 'chamilo_database_version';

+ 11 - 7
main/install/index.php

@@ -839,17 +839,18 @@ if (@$_POST['step2']) {
         database_server_connect();
         // Initialization of the database connection encoding intentionaly is not done.
         // This is the old style for connecting to the database server, that is implemented here.
-
-        // Inializing global variables that are to be used by the included scripts.
+        // Initializing global variables that are to be used by the included scripts.
         $dblist = Database::get_databases();
         $perm = api_get_permissions_for_new_directories();
         $perm_file = api_get_permissions_for_new_files();
 
+        // We guess
         if (empty($my_old_version)) {
             $my_old_version = '1.8.6.2';
-        } //we guess
+        }
 
         $_configuration['main_database'] = $dbNameForm;
+
         $app['monolog']->addInfo('Starting migration process from old version: '.$my_old_version.' ('.time().')');
 
         if (isset($userPasswordCrypted)) {
@@ -890,14 +891,14 @@ if (@$_POST['step2']) {
             case '1.6.5':
                 include 'update-db-1.6.x-1.8.0.inc.php';
                 include 'update-files-1.6.x-1.8.0.inc.php';
-            //intentionally no break to continue processing
+                // Intentionally no break to continue processing
             case '1.8':
             case '1.8.0':
                 include 'update-db-1.8.0-1.8.2.inc.php';
-            //intentionally no break to continue processing
+                // Intentionally no break to continue processing
             case '1.8.2':
                 include 'update-db-1.8.2-1.8.3.inc.php';
-            //intentionally no break to continue processing
+                // Intentionally no break to continue processing
             case '1.8.3':
                 include 'update-db-1.8.3-1.8.4.inc.php';
                 include 'update-files-1.8.3-1.8.4.inc.php';
@@ -947,6 +948,9 @@ if (@$_POST['step2']) {
         }
         movingFilesInDataFolder();
     } else {
+
+        $_configuration['main_database'] = $dbNameForm;
+
         set_file_folder_permissions();
         database_server_connect();
 
@@ -994,4 +998,4 @@ if (@$_POST['step2']) {
 <!-- wrapper end-->
 <footer></footer>
 </body>
-</html>
+</html>

+ 5 - 10
main/install/install.lib.php

@@ -623,7 +623,6 @@ function load_database_script($db_script)
 
 function parse_sql_queries($sql_text)
 {
-
     //split in array of sql strings
     $sql_instructions = array();
     split_sql_file($sql_instructions, $sql_text);
@@ -2481,14 +2480,14 @@ function get_countries_list_from_array($combo = false)
 }
 
 /**
- * Lockis settings that can't be changed in other portals
+ * Locking settings that can't be changed in other portals
  */
 function locking_settings()
 {
     $access_url_locked_settings = api_get_locked_settings();
     $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
     foreach ($access_url_locked_settings as $setting) {
-        $sql = "UPDATE $table SET access_url_locked = 1 WHERE variable  = '$setting'";
+        $sql = "UPDATE $table SET access_url_locked = 1 WHERE variable = '$setting'";
         Database::query($sql);
     }
 }
@@ -2499,14 +2498,10 @@ function update_dir_and_files_permissions()
     $permissions_for_new_directories = isset($_SESSION['permissions_for_new_directories']) ? $_SESSION['permissions_for_new_directories'] : 0770;
     $permissions_for_new_files = isset($_SESSION['permissions_for_new_files']) ? $_SESSION['permissions_for_new_files'] : 0660;
     // use decoct() to store as string
-    $sql = "UPDATE $table SET selected_value = '0".decoct(
-        $permissions_for_new_directories
-    )."' WHERE variable  = 'permissions_for_new_directories'";
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_directories)."' WHERE variable  = 'permissions_for_new_directories'";
     Database::query($sql);
 
-    $sql = "UPDATE $table SET selected_value = '0".decoct(
-        $permissions_for_new_files
-    )."' WHERE variable  = 'permissions_for_new_files'";
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_files)."' WHERE variable  = 'permissions_for_new_files'";
     Database::query($sql);
 
     unset($_SESSION['permissions_for_new_directories']);
@@ -2632,4 +2627,4 @@ function movingFilesInDataFolder()
             system($copy);
         }
     }
-}
+}

+ 11 - 10
main/install/install_db.inc.php

@@ -20,15 +20,15 @@ if (!defined('SYSTEM_INSTALLATION')) {
 $urlForm = api_add_trailing_slash($urlForm);
 
 switch ($encryptPassForm) {
-	case 'md5' :
-		$passToStore = md5($passForm);
-		break;
-	case 'sha1' :
-		$passToStore = sha1($passForm);
-		break;
-	case 'none' :
-		$passToStore = $passForm;
+    case 'md5':
+        $passToStore = md5($passForm);
 		break;
+    case 'sha1':
+        $passToStore = sha1($passForm);
+        break;
+    case 'none':
+        $passToStore = $passForm;
+        break;
 }
 
 $dbPrefixForm = preg_replace('/[^a-zA-Z0-9_\-]/', '', $dbPrefixForm);
@@ -76,7 +76,7 @@ if (!defined('CLI_INSTALLATION')) {
 	if (database_exists($mysqlMainDb)) {
         $create_database = false;
     }
-	//Create database
+	// Create database.
 	if ($create_database) {
         $charset_clause = ' DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci';
 		$sql = "CREATE DATABASE IF NOT EXISTS `$mysqlMainDb` $charset_clause";
@@ -129,6 +129,7 @@ $app['monolog']->addInfo("fill_track_countries_table");
 fill_track_countries_table($track_countries_table);
 
 $app['monolog']->addInfo("locking_settings");
+
 locking_settings();
 
-update_dir_and_files_permissions();
+update_dir_and_files_permissions();