fixup! Debug MySQL failing

diff --git a/app/DoctrineMigrations/Version20181029131313.php b/app/DoctrineMigrations/Version20181029131313.php
index 328dc80ea523d0e30c12cebda4f2e739f99847e2..47b2f3f41bcaad5fee96d3f2e820d544d0d04f70 100644 (file)
--- a/app/DoctrineMigrations/Version20181029131313.php
+++ b/app/DoctrineMigrations/Version20181029131313.php
@@ -14,20 +14,16 @@ final class Version20181029131313 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME TO ' . $this->getTable('internal_setting') . ';');
-
         if ('mysql' === $this->connection->getDatabasePlatform()->getName()) {
-            $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
+            $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
 
-            $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' CHANGE `name` `name` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
-            $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' CHANGE `section` `section` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
+            $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' CHANGE `name` `name` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
+            $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' CHANGE `section` `section` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
         }
     }
 
     public function down(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME TO ' . $this->getTable('craue_config_setting') . ';');
-
         if ('mysql' === $this->connection->getDatabasePlatform()->getName()) {
             $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
 

diff --git a/app/config/config.yml b/app/config/config.yml
index b2ab00926a57bae9b3e3af6ba33cccfcf8faf381..092f3ec04860f342aecbfffb607252a45d168c80 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -365,6 +365,3 @@ jms_serializer:
 sensio_framework_extra:
    router:
         annotations: false
-
-craue_config:
-    entity_name: Wallabag\CoreBundle\Entity\InternalSetting

diff --git a/src/Wallabag/CoreBundle/Entity/InternalSetting.php b/src/Wallabag/CoreBundle/Entity/InternalSetting.php
deleted file mode 100644 (file)
index 419a277..0000000
--- a/src/Wallabag/CoreBundle/Entity/InternalSetting.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Entity;
-
-use Craue\ConfigBundle\Entity\BaseSetting;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * Internal Setting.
- *
- * @ORM\Entity(repositoryClass="Craue\ConfigBundle\Repository\SettingRepository")
- * @ORM\Table(name="internal_setting")
- * @ORM\AttributeOverrides({
- *      @ORM\AttributeOverride(name="name",
- *          column=@ORM\Column(
- *              name     = "name",
- *              length   = 191
- *          )
- *      ),
- *      @ORM\AttributeOverride(name="section",
- *          column=@ORM\Column(
- *              name     = "section",
- *              length   = 191
- *          )
- *      )
- * })
- */
-class InternalSetting extends BaseSetting
-{
-    /**
-     * @var string|null
-     *
-     * @ORM\Column(name="value", type="string", nullable=true, length=191)
-     */
-    protected $value;
-}