Merge remote-tracking branch 'origin/master' into 2.3

[github/wallabag/wallabag.git] / app / DoctrineMigrations / Version20161022134138.php

diff --git a/app/DoctrineMigrations/Version20161022134138.php b/app/DoctrineMigrations/Version20161022134138.php
index 22469f632ffe867fa317757c0a4a40244dd54aaa..39949e7d5d1edaa7b504076f225023a5d80f00b3 100644 (file)
--- a/app/DoctrineMigrations/Version20161022134138.php
+++ b/app/DoctrineMigrations/Version20161022134138.php
@@ -7,6 +7,9 @@ use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+/**
+ * Converted database to utf8mb4 encoding (for MySQL only).
+ */
 class Version20161022134138 extends AbstractMigration implements ContainerAwareInterface
 {
     /**
@@ -35,7 +38,7 @@ class Version20161022134138 extends AbstractMigration implements ContainerAwareI
 
         // convert field length for utf8mb4
         // http://stackoverflow.com/a/31474509/569101
-        $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE confirmation_token confirmation_token VARCHAR(180) NOT NULL;');
+        $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE confirmation_token confirmation_token VARCHAR(180) DEFAULT NULL;');
         $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE salt salt VARCHAR(180) NOT NULL;');
         $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE password password VARCHAR(180) NOT NULL;');