Fix upgrade see #1983

app/Migrations/Schema/V111/Version111.php

@@ -444,64 +444,6 @@ class Version111 extends AbstractMigrationChamilo
             }
         }
 
-        // Skill
-        if ($schema->hasTable('skill')) {
-            $table = $schema->getTable('skill');
-            $this->addSql('ALTER TABLE skill CHANGE name name VARCHAR(255) NOT NULL, CHANGE short_code short_code VARCHAR(100) NOT NULL, CHANGE description description LONGTEXT NOT NULL, CHANGE icon icon VARCHAR(255) NOT NULL, CHANGE updated_at updated_at DATETIME NOT NULL;');
-
-            if ($table->hasForeignKey('FK_5E3DE477CCFA12B8') == false) {
-                $this->addSql('ALTER TABLE skill ADD CONSTRAINT FK_5E3DE477CCFA12B8 FOREIGN KEY (profile_id) REFERENCES skill_level_profile (id);');
-            }
-
-            if ($table->hasIndex('IDX_5E3DE477CCFA12B8') == false) {
-                $this->addSql('CREATE INDEX IDX_5E3DE477CCFA12B8 ON skill (profile_id);');
-            }
-        }
-
-        // skill_rel_user
-        if ($schema->hasTable('skill_rel_user')) {
-            $table = $schema->getTable('skill_rel_user');
-            $this->addSql('ALTER TABLE skill_rel_user CHANGE acquired_skill_at acquired_skill_at DATETIME NOT NULL, CHANGE argumentation argumentation LONGTEXT NOT NULL, CHANGE argumentation_author_id argumentation_author_id INT NOT NULL;');
-
-            if ($table->hasForeignKey('FK_79D3D95AA76ED395') == false) {
-                $this->addSql('ALTER TABLE skill_rel_user ADD CONSTRAINT FK_79D3D95AA76ED395 FOREIGN KEY (user_id) REFERENCES user (id);');
-            }
-            if ($table->hasForeignKey('FK_79D3D95A5585C142') == false) {
-                $this->addSql('ALTER TABLE skill_rel_user ADD CONSTRAINT FK_79D3D95A5585C142 FOREIGN KEY (skill_id) REFERENCES skill (id);');
-            }
-            if ($table->hasForeignKey('FK_79D3D95A591CC992') == false) {
-                $this->addSql('ALTER TABLE skill_rel_user ADD CONSTRAINT FK_79D3D95A591CC992 FOREIGN KEY (course_id) REFERENCES course (id);');
-            }
-
-            if ($table->hasForeignKey('FK_79D3D95A613FECDF') == false) {
-                $this->addSql('ALTER TABLE skill_rel_user ADD CONSTRAINT FK_79D3D95A613FECDF FOREIGN KEY (session_id) REFERENCES session (id);');
-            }
-            if ($table->hasForeignKey('FK_79D3D95AF68F11CE') == false) {
-                $this->addSql('ALTER TABLE skill_rel_user ADD CONSTRAINT FK_79D3D95AF68F11CE FOREIGN KEY (acquired_level) REFERENCES skill_level (id);');
-            }
-            if ($table->hasIndex('IDX_79D3D95AA76ED395') == false) {
-                $this->addSql('CREATE INDEX IDX_79D3D95AA76ED395 ON skill_rel_user(user_id);');
-            }
-            if ($table->hasIndex('IDX_79D3D95A5585C142') == false) {
-                $this->addSql('CREATE INDEX IDX_79D3D95A5585C142 ON skill_rel_user(skill_id);');
-            }
-            if ($table->hasIndex('IDX_79D3D95A591CC992') == false) {
-                $this->addSql('CREATE INDEX IDX_79D3D95A591CC992 ON skill_rel_user(course_id);');
-            }
-            if ($table->hasIndex('IDX_79D3D95A613FECDF') == false) {
-                $this->addSql('CREATE INDEX IDX_79D3D95A613FECDF ON skill_rel_user(session_id);');
-            }
-            if ($table->hasIndex('IDX_79D3D95AF68F11CE') == false) {
-                $this->addSql('CREATE INDEX IDX_79D3D95AF68F11CE ON skill_rel_user (acquired_level);');
-            }
-            if ($table->hasIndex('IDX_79D3D95AF68F11CE') == false) {
-                $this->addSql('CREATE INDEX idx_select_s_c_u ON skill_rel_user (session_id, course_id, user_id);');
-            }
-            if ($table->hasIndex('IDX_79D3D95AF68F11CE') == false) {
-                $this->addSql('CREATE INDEX idx_select_sk_u ON skill_rel_user(skill_id, user_id);');
-            }
-        }
-
         if ($schema->hasTable('skill_profile')) {
             $this->addSql('ALTER TABLE skill_profile CHANGE name name VARCHAR(255) NOT NULL, CHANGE description description LONGTEXT NOT NULL;');
         }
@@ -533,18 +475,6 @@ class Version111 extends AbstractMigrationChamilo
 
         $this->addSql('ALTER TABLE skill_rel_gradebook CHANGE type type VARCHAR(10) NOT NULL;');
 
-        // skill_level
-        if ($schema->hasTable('skill_level')) {
-            $table = $schema->getTable('skill_level');
-            $this->addSql('ALTER TABLE skill_level CHANGE profile_id profile_id INT DEFAULT NULL, CHANGE position position INT NOT NULL, CHANGE short_name short_name VARCHAR(255) NOT NULL;');
-            if ($table->hasForeignKey('FK_BFC25F2FCCFA12B8') == false) {
-                $this->addSql('ALTER TABLE skill_level ADD CONSTRAINT FK_BFC25F2FCCFA12B8 FOREIGN KEY (profile_id) REFERENCES skill_level_profile (id);');
-            }
-            if ($table->hasIndex('IDX_BFC25F2FCCFA12B8') == false) {
-                $this->addSql('CREATE INDEX IDX_BFC25F2FCCFA12B8 ON skill_level (profile_id);');
-            }
-        }
-
         // access_url_rel_user
         if ($schema->hasTable('access_url_rel_user')) {
             $table = $schema->getTable('access_url_rel_user');
@@ -591,7 +521,7 @@ class Version111 extends AbstractMigrationChamilo
             }
         }
 
-        $this->addSql('ALTER TABLE session_rel_course DROP category, CHANGE session_id session_id INT NOT NULL, CHANGE c_id c_id INT NOT NULL, CHANGE nbr_users nbr_users INT NOT NULL, CHANGE position position INT NOT NULL;');
+        $this->addSql('ALTER TABLE session_rel_course DROP category');
     }
 
     /**

app/Migrations/Schema/V111/Version20160405112100.php

@@ -24,9 +24,89 @@ class Version20160405112100 extends AbstractMigrationChamilo
         $this->addSql(
             'CREATE TABLE skill_rel_user_comment (id INT AUTO_INCREMENT NOT NULL, skill_rel_user_id INT NOT NULL, feedback_giver_id INT NOT NULL, feedback_text TEXT, feedback_value INT, feedback_datetime DATETIME, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB'
         );
-        $this->addSql(
-            'ALTER TABLE skill ADD profile_id INT'
-        );
+
+        $this->addSql('ALTER TABLE skill ADD profile_id INT');
+
+        if ($schema->hasTable('skill')) {
+            $table = $schema->getTable('skill');
+            if ($table->hasForeignKey('FK_5E3DE477CCFA12B8') == false) {
+                $this->addSql('ALTER TABLE skill ADD CONSTRAINT FK_5E3DE477CCFA12B8 FOREIGN KEY (profile_id) REFERENCES skill_level_profile (id);');
+            }
+
+            if ($table->hasIndex('IDX_5E3DE477CCFA12B8') == false) {
+                $this->addSql('CREATE INDEX IDX_5E3DE477CCFA12B8 ON skill (profile_id);');
+            }
+        }
+
+         // Skill
+        if ($schema->hasTable('skill')) {
+            $this->addSql('ALTER TABLE skill CHANGE name name VARCHAR(255) NOT NULL, CHANGE short_code short_code VARCHAR(100) NOT NULL, CHANGE description description LONGTEXT NOT NULL, CHANGE icon icon VARCHAR(255) NOT NULL, CHANGE updated_at updated_at DATETIME NOT NULL;');
+        }
+
+        // skill_rel_user
+        if ($schema->hasTable('skill_rel_user')) {
+            $table = $schema->getTable('skill_rel_user');
+            $this->addSql('ALTER TABLE skill_rel_user CHANGE acquired_skill_at acquired_skill_at DATETIME NOT NULL, CHANGE argumentation argumentation LONGTEXT NOT NULL, CHANGE argumentation_author_id argumentation_author_id INT NOT NULL;');
+
+            $this->addSql('UPDATE skill_rel_user SET course_id = NULL WHERE course_id = 0');
+            $this->addSql('UPDATE skill_rel_user SET skill_id = NULL WHERE skill_id = 0');
+            $this->addSql('UPDATE skill_rel_user SET user_id = NULL WHERE user_id = 0');
+            $this->addSql('UPDATE skill_rel_user SET session_id = NULL WHERE session_id = 0');
+            $this->addSql('UPDATE skill_rel_user SET acquired_level = NULL WHERE acquired_level = 0');
+
+
+            if ($table->hasForeignKey('FK_79D3D95AA76ED395') == false) {
+                $this->addSql('ALTER TABLE skill_rel_user ADD CONSTRAINT FK_79D3D95AA76ED395 FOREIGN KEY (user_id) REFERENCES user (id);');
+            }
+            if ($table->hasForeignKey('FK_79D3D95A5585C142') == false) {
+                $this->addSql('ALTER TABLE skill_rel_user ADD CONSTRAINT FK_79D3D95A5585C142 FOREIGN KEY (skill_id) REFERENCES skill (id);');
+            }
+            if ($table->hasForeignKey('FK_79D3D95A591CC992') == false) {
+                $this->addSql('ALTER TABLE skill_rel_user ADD CONSTRAINT FK_79D3D95A591CC992 FOREIGN KEY (course_id) REFERENCES course (id);');
+            }
+            if ($table->hasForeignKey('FK_79D3D95A613FECDF') == false) {
+                $this->addSql('ALTER TABLE skill_rel_user ADD CONSTRAINT FK_79D3D95A613FECDF FOREIGN KEY (session_id) REFERENCES session (id);');
+            }
+            if ($table->hasForeignKey('FK_79D3D95AF68F11CE') == false) {
+                $this->addSql('ALTER TABLE skill_rel_user ADD CONSTRAINT FK_79D3D95AF68F11CE FOREIGN KEY (acquired_level) REFERENCES skill_level (id);');
+            }
+            if ($table->hasIndex('IDX_79D3D95AA76ED395') == false) {
+                $this->addSql('CREATE INDEX IDX_79D3D95AA76ED395 ON skill_rel_user(user_id);');
+            }
+            if ($table->hasIndex('IDX_79D3D95A5585C142') == false) {
+                $this->addSql('CREATE INDEX IDX_79D3D95A5585C142 ON skill_rel_user(skill_id);');
+            }
+            if ($table->hasIndex('IDX_79D3D95A591CC992') == false) {
+                $this->addSql('CREATE INDEX IDX_79D3D95A591CC992 ON skill_rel_user(course_id);');
+            }
+            if ($table->hasIndex('IDX_79D3D95A613FECDF') == false) {
+                $this->addSql('CREATE INDEX IDX_79D3D95A613FECDF ON skill_rel_user(session_id);');
+            }
+            if ($table->hasIndex('IDX_79D3D95AF68F11CE') == false) {
+                $this->addSql('CREATE INDEX IDX_79D3D95AF68F11CE ON skill_rel_user (acquired_level);');
+            }
+            if ($table->hasIndex('IDX_79D3D95AF68F11CE') == false) {
+                $this->addSql('CREATE INDEX idx_select_s_c_u ON skill_rel_user (session_id, course_id, user_id);');
+            }
+            if ($table->hasIndex('IDX_79D3D95AF68F11CE') == false) {
+                $this->addSql('CREATE INDEX idx_select_sk_u ON skill_rel_user(skill_id, user_id);');
+            }
+        }
+
+         // skill_level
+        if ($schema->hasTable('skill_level')) {
+            $table = $schema->getTable('skill_level');
+            $this->addSql('ALTER TABLE skill_level CHANGE profile_id profile_id INT DEFAULT NULL, CHANGE position position INT NOT NULL, CHANGE short_name short_name VARCHAR(255) NOT NULL;');
+            if ($table->hasForeignKey('FK_BFC25F2FCCFA12B8') == false) {
+                $this->addSql('ALTER TABLE skill_level ADD CONSTRAINT FK_BFC25F2FCCFA12B8 FOREIGN KEY (profile_id) REFERENCES skill_level_profile (id);');
+            }
+            if ($table->hasIndex('IDX_BFC25F2FCCFA12B8') == false) {
+                $this->addSql('CREATE INDEX IDX_BFC25F2FCCFA12B8 ON skill_level (profile_id);');
+            }
+        }
+
+
+
     }
 
     /**

app/Migrations/Schema/V111/Version20170522120000.php

@@ -9,7 +9,7 @@ use Doctrine\DBAL\Schema\Schema;
 /**
  * Class Version20170522120000
  * Remove track_e_attempt.course_code which is deleted between 1.9 and 1.10
- * but somehow still existed in the 1.10 entity (and it is not deleted from 
+ * but somehow still existed in the 1.10 entity (and it is not deleted from
  * 1.10 to 1.11)
  * @package Application\Migrations\Schema\V111
  */
@@ -21,7 +21,6 @@ class Version20170522120000 extends AbstractMigrationChamilo
     public function up(Schema $schema)
     {
         $trackEAttempt = $schema->getTable('track_e_attempt');
-
         if ($trackEAttempt->hasColumn('course_code')) {
             $this->addSql("ALTER TABLE track_e_attempt DROP COLUMN course_code");
         }