git branchMerge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

app/Migrations/Schema/V110/Version110.php

@@ -76,8 +76,16 @@ class Version110 extends AbstractMigrationChamilo
             );
         }
 
-        $this->addSql("ALTER TABLE session ADD COLUMN duration int");
-        $this->addSql("ALTER TABLE session_rel_user ADD COLUMN duration int");
+        $sessionTable = $schema->getTable('session');
+        if (!$sessionTable->hasColumn('duration')) {
+            $this->addSql("ALTER TABLE session ADD COLUMN duration int");
+        }
+
+        $sessionRelUser = $schema->getTable('session_rel_user');
+        if (!$sessionRelUser->hasColumn('duration')) {
+            $this->addSql("ALTER TABLE session_rel_user ADD COLUMN duration int");
+        }
+
         $this->addSql("ALTER TABLE skill ADD COLUMN criteria text");
         $this->addSql("ALTER TABLE gradebook_category ADD COLUMN generate_certificates TINYINT NOT NULL DEFAULT 0");
         $this->addSql("ALTER TABLE track_e_access ADD COLUMN c_id int NOT NULL");

tests/scripts/fix_migrations_1.9.x_1.10.0.php

@@ -47,7 +47,7 @@ Database::query("UPDATE session SET id_coach = NULL WHERE id_coach = 0");
 Database::query("UPDATE session SET session_category_id = NULL WHERE session_category_id = 0");
 Database::query("ALTER TABLE session ADD CONSTRAINT FK_D044D5D4D1DC2CFC FOREIGN KEY (id_coach) REFERENCES user (id)");
 Database::query("ALTER TABLE session ADD CONSTRAINT FK_D044D5D4EE1F8395 FOREIGN KEY (session_category_id) REFERENCES session_category (id)");
-Database::query("ALTER TABLE session_rel_user ADD moved_status INT DEFAULT NULL, ADD moved_at DATETIME DEFAULT NULL, CHANGE id id INT AUTO_INCREMENT NOT NULL, CHANGE session_id session_id INT DEFAULT NULL, CHANGE user_id user_id INT DEFAULT NULL, CHANGE relation_type relation_type INT NOT NULL, CHANGE duration moved_to INT DEFAULT NULL");
+Database::query("ALTER TABLE session_rel_user ADD moved_status INT DEFAULT NULL, ADD moved_at DATETIME DEFAULT NULL, CHANGE id id INT AUTO_INCREMENT NOT NULL, CHANGE session_id session_id INT DEFAULT NULL, CHANGE user_id user_id INT DEFAULT NULL, CHANGE relation_type relation_type INT NOT NULL");
 Database::query("ALTER TABLE session_rel_user ENGINE=InnoDB");
 Database::query("ALTER TABLE session_rel_user ADD CONSTRAINT FK_B0D7D4C0613FECDF FOREIGN KEY (session_id) REFERENCES session (id)");
 Database::query("ALTER TABLE session_rel_user ADD CONSTRAINT FK_B0D7D4C0A76ED395 FOREIGN KEY (user_id) REFERENCES user (id)");