From 7a340375c30531e0983deacdbfe39f13cb961005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 30 Jan 2017 16:22:03 +0100 Subject: [PATCH 1/2] Fixed duplicate entry for share_public in craue_setting_table --- .../Version20160410190541.php | 10 +- docs/de/user/query-upgrade-21-22.rst | 105 ++++++++++++++++++ docs/en/user/query-upgrade-21-22.rst | 105 ++++++++++++++++++ docs/fr/user/query-upgrade-21-22.rst | 105 ++++++++++++++++++ 4 files changed, 324 insertions(+), 1 deletion(-) diff --git a/app/DoctrineMigrations/Version20160410190541.php b/app/DoctrineMigrations/Version20160410190541.php index ebf4135f9..80bcd12a9 100644 --- a/app/DoctrineMigrations/Version20160410190541.php +++ b/app/DoctrineMigrations/Version20160410190541.php @@ -40,7 +40,15 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI 'notnull' => false, 'length' => 23, ]); - $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_public', '1', 'entry')"); + + $sharePublic = $this->container + ->get('doctrine.orm.default_entity_manager') + ->getConnection() + ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_public'"); + + if (false === $sharePublic) { + $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_public', '1', 'entry')"); + } } /** diff --git a/docs/de/user/query-upgrade-21-22.rst b/docs/de/user/query-upgrade-21-22.rst index f32d5a196..fa9835a81 100644 --- a/docs/de/user/query-upgrade-21-22.rst +++ b/docs/de/user/query-upgrade-21-22.rst @@ -724,6 +724,111 @@ Migration down CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical) CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token) +Migration 20161214094402 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry CHANGE uuid uid VARCHAR(23) + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry CHANGE uid uuid VARCHAR(23) + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry RENAME uuid TO uid + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry RENAME uid TO uuid + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + CREATE TABLE __temp__wallabag_entry ( + id INTEGER NOT NULL, + user_id INTEGER DEFAULT NULL, + uid VARCHAR(23) DEFAULT NULL, + title CLOB DEFAULT NULL, + url CLOB DEFAULT NULL, + is_archived BOOLEAN NOT NULL, + is_starred BOOLEAN NOT NULL, + content CLOB DEFAULT NULL, + created_at DATETIME NOT NULL, + updated_at DATETIME NOT NULL, + mimetype CLOB DEFAULT NULL, + language CLOB DEFAULT NULL, + reading_time INTEGER DEFAULT NULL, + domain_name CLOB DEFAULT NULL, + preview_picture CLOB DEFAULT NULL, + is_public BOOLEAN DEFAULT '0', + http_status VARCHAR(3) DEFAULT NULL, + PRIMARY KEY(id) + ); + INSERT INTO __temp__wallabag_entry SELECT id,user_id,uuid,title,url,is_archived,is_starred,content,created_at,updated_at,mimetype,language,reading_time,domain_name,preview_picture,is_public,http_status FROM wallabag_entry; + DROP TABLE wallabag_entry; + ALTER TABLE __temp__wallabag_entry RENAME TO wallabag_entry + CREATE INDEX uid ON wallabag_entry (uid) + CREATE INDEX created_at ON wallabag_entry (created_at) + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) + + +Migration down +"""""""""""""" + +.. code-block:: sql + + CREATE TABLE __temp__wallabag_entry ( + id INTEGER NOT NULL, + user_id INTEGER DEFAULT NULL, + uuid VARCHAR(23) DEFAULT NULL, + title CLOB DEFAULT NULL, + url CLOB DEFAULT NULL, + is_archived BOOLEAN NOT NULL, + is_starred BOOLEAN NOT NULL, + content CLOB DEFAULT NULL, + created_at DATETIME NOT NULL, + updated_at DATETIME NOT NULL, + mimetype CLOB DEFAULT NULL, + language CLOB DEFAULT NULL, + reading_time INTEGER DEFAULT NULL, + domain_name CLOB DEFAULT NULL, + preview_picture CLOB DEFAULT NULL, + is_public BOOLEAN DEFAULT '0', + http_status VARCHAR(3) DEFAULT NULL, + PRIMARY KEY(id) + ); + INSERT INTO __temp__wallabag_entry SELECT id,user_id,uid,title,url,is_archived,is_starred,content,created_at,updated_at,mimetype,language,reading_time,domain_name,preview_picture,is_public,http_status FROM wallabag_entry; + DROP TABLE wallabag_entry; + ALTER TABLE __temp__wallabag_entry RENAME TO wallabag_entry + CREATE INDEX uid ON wallabag_entry (uid) + CREATE INDEX created_at ON wallabag_entry (created_at) + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) + Migration 20161214094403 ------------------------ diff --git a/docs/en/user/query-upgrade-21-22.rst b/docs/en/user/query-upgrade-21-22.rst index f32d5a196..fa9835a81 100644 --- a/docs/en/user/query-upgrade-21-22.rst +++ b/docs/en/user/query-upgrade-21-22.rst @@ -724,6 +724,111 @@ Migration down CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical) CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token) +Migration 20161214094402 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry CHANGE uuid uid VARCHAR(23) + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry CHANGE uid uuid VARCHAR(23) + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry RENAME uuid TO uid + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry RENAME uid TO uuid + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + CREATE TABLE __temp__wallabag_entry ( + id INTEGER NOT NULL, + user_id INTEGER DEFAULT NULL, + uid VARCHAR(23) DEFAULT NULL, + title CLOB DEFAULT NULL, + url CLOB DEFAULT NULL, + is_archived BOOLEAN NOT NULL, + is_starred BOOLEAN NOT NULL, + content CLOB DEFAULT NULL, + created_at DATETIME NOT NULL, + updated_at DATETIME NOT NULL, + mimetype CLOB DEFAULT NULL, + language CLOB DEFAULT NULL, + reading_time INTEGER DEFAULT NULL, + domain_name CLOB DEFAULT NULL, + preview_picture CLOB DEFAULT NULL, + is_public BOOLEAN DEFAULT '0', + http_status VARCHAR(3) DEFAULT NULL, + PRIMARY KEY(id) + ); + INSERT INTO __temp__wallabag_entry SELECT id,user_id,uuid,title,url,is_archived,is_starred,content,created_at,updated_at,mimetype,language,reading_time,domain_name,preview_picture,is_public,http_status FROM wallabag_entry; + DROP TABLE wallabag_entry; + ALTER TABLE __temp__wallabag_entry RENAME TO wallabag_entry + CREATE INDEX uid ON wallabag_entry (uid) + CREATE INDEX created_at ON wallabag_entry (created_at) + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) + + +Migration down +"""""""""""""" + +.. code-block:: sql + + CREATE TABLE __temp__wallabag_entry ( + id INTEGER NOT NULL, + user_id INTEGER DEFAULT NULL, + uuid VARCHAR(23) DEFAULT NULL, + title CLOB DEFAULT NULL, + url CLOB DEFAULT NULL, + is_archived BOOLEAN NOT NULL, + is_starred BOOLEAN NOT NULL, + content CLOB DEFAULT NULL, + created_at DATETIME NOT NULL, + updated_at DATETIME NOT NULL, + mimetype CLOB DEFAULT NULL, + language CLOB DEFAULT NULL, + reading_time INTEGER DEFAULT NULL, + domain_name CLOB DEFAULT NULL, + preview_picture CLOB DEFAULT NULL, + is_public BOOLEAN DEFAULT '0', + http_status VARCHAR(3) DEFAULT NULL, + PRIMARY KEY(id) + ); + INSERT INTO __temp__wallabag_entry SELECT id,user_id,uid,title,url,is_archived,is_starred,content,created_at,updated_at,mimetype,language,reading_time,domain_name,preview_picture,is_public,http_status FROM wallabag_entry; + DROP TABLE wallabag_entry; + ALTER TABLE __temp__wallabag_entry RENAME TO wallabag_entry + CREATE INDEX uid ON wallabag_entry (uid) + CREATE INDEX created_at ON wallabag_entry (created_at) + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) + Migration 20161214094403 ------------------------ diff --git a/docs/fr/user/query-upgrade-21-22.rst b/docs/fr/user/query-upgrade-21-22.rst index f32d5a196..fa9835a81 100644 --- a/docs/fr/user/query-upgrade-21-22.rst +++ b/docs/fr/user/query-upgrade-21-22.rst @@ -724,6 +724,111 @@ Migration down CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical) CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token) +Migration 20161214094402 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry CHANGE uuid uid VARCHAR(23) + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry CHANGE uid uuid VARCHAR(23) + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry RENAME uuid TO uid + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry RENAME uid TO uuid + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + CREATE TABLE __temp__wallabag_entry ( + id INTEGER NOT NULL, + user_id INTEGER DEFAULT NULL, + uid VARCHAR(23) DEFAULT NULL, + title CLOB DEFAULT NULL, + url CLOB DEFAULT NULL, + is_archived BOOLEAN NOT NULL, + is_starred BOOLEAN NOT NULL, + content CLOB DEFAULT NULL, + created_at DATETIME NOT NULL, + updated_at DATETIME NOT NULL, + mimetype CLOB DEFAULT NULL, + language CLOB DEFAULT NULL, + reading_time INTEGER DEFAULT NULL, + domain_name CLOB DEFAULT NULL, + preview_picture CLOB DEFAULT NULL, + is_public BOOLEAN DEFAULT '0', + http_status VARCHAR(3) DEFAULT NULL, + PRIMARY KEY(id) + ); + INSERT INTO __temp__wallabag_entry SELECT id,user_id,uuid,title,url,is_archived,is_starred,content,created_at,updated_at,mimetype,language,reading_time,domain_name,preview_picture,is_public,http_status FROM wallabag_entry; + DROP TABLE wallabag_entry; + ALTER TABLE __temp__wallabag_entry RENAME TO wallabag_entry + CREATE INDEX uid ON wallabag_entry (uid) + CREATE INDEX created_at ON wallabag_entry (created_at) + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) + + +Migration down +"""""""""""""" + +.. code-block:: sql + + CREATE TABLE __temp__wallabag_entry ( + id INTEGER NOT NULL, + user_id INTEGER DEFAULT NULL, + uuid VARCHAR(23) DEFAULT NULL, + title CLOB DEFAULT NULL, + url CLOB DEFAULT NULL, + is_archived BOOLEAN NOT NULL, + is_starred BOOLEAN NOT NULL, + content CLOB DEFAULT NULL, + created_at DATETIME NOT NULL, + updated_at DATETIME NOT NULL, + mimetype CLOB DEFAULT NULL, + language CLOB DEFAULT NULL, + reading_time INTEGER DEFAULT NULL, + domain_name CLOB DEFAULT NULL, + preview_picture CLOB DEFAULT NULL, + is_public BOOLEAN DEFAULT '0', + http_status VARCHAR(3) DEFAULT NULL, + PRIMARY KEY(id) + ); + INSERT INTO __temp__wallabag_entry SELECT id,user_id,uid,title,url,is_archived,is_starred,content,created_at,updated_at,mimetype,language,reading_time,domain_name,preview_picture,is_public,http_status FROM wallabag_entry; + DROP TABLE wallabag_entry; + ALTER TABLE __temp__wallabag_entry RENAME TO wallabag_entry + CREATE INDEX uid ON wallabag_entry (uid) + CREATE INDEX created_at ON wallabag_entry (created_at) + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) + Migration 20161214094403 ------------------------ From a5cd696b22599b1ccb5f2adc05c5ffc563da9756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 30 Jan 2017 21:21:49 +0100 Subject: [PATCH 2/2] Added check in migration about uuid field --- app/DoctrineMigrations/Version20160410190541.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/DoctrineMigrations/Version20160410190541.php b/app/DoctrineMigrations/Version20160410190541.php index 80bcd12a9..6294d8420 100644 --- a/app/DoctrineMigrations/Version20160410190541.php +++ b/app/DoctrineMigrations/Version20160410190541.php @@ -34,7 +34,7 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI { $entryTable = $schema->getTable($this->getTable('entry')); - $this->skipIf($entryTable->hasColumn('uid'), 'It seems that you already played this migration.'); + $this->skipIf($entryTable->hasColumn('uid') || $entryTable->hasColumn('uuid'), 'It seems that you already played this migration.'); $entryTable->addColumn('uid', 'string', [ 'notnull' => false,