aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-10-18 11:33:30 +0200
committerGitHub <noreply@github.com>2017-10-18 11:33:30 +0200
commit1c5081cdc5bef1e6992b66db020a9348b5607d55 (patch)
tree27004b7ad2fbe9a33defa12789f73c64f87c5249
parent91f9bacf735e61072d6f0e9f47cc5ec6401193c7 (diff)
parentabce2f05dd41bd88d923745a7c8fe56d1f3fd944 (diff)
downloadwallabag-1c5081cdc5bef1e6992b66db020a9348b5607d55.tar.gz
wallabag-1c5081cdc5bef1e6992b66db020a9348b5607d55.tar.zst
wallabag-1c5081cdc5bef1e6992b66db020a9348b5607d55.zip
Merge pull request #3373 from wallabag/change-readingtime-notnull
Changed reading_time field to prevent null values
-rw-r--r--app/DoctrineMigrations/Version20171008195606.php64
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php4
2 files changed, 66 insertions, 2 deletions
diff --git a/app/DoctrineMigrations/Version20171008195606.php b/app/DoctrineMigrations/Version20171008195606.php
new file mode 100644
index 00000000..c190f4ed
--- /dev/null
+++ b/app/DoctrineMigrations/Version20171008195606.php
@@ -0,0 +1,64 @@
1<?php
2
3namespace Application\Migrations;
4
5use Doctrine\DBAL\Migrations\AbstractMigration;
6use Doctrine\DBAL\Schema\Schema;
7use Symfony\Component\DependencyInjection\ContainerAwareInterface;
8use Symfony\Component\DependencyInjection\ContainerInterface;
9
10/**
11 * Changed reading_time field to prevent null value.
12 */
13class Version20171008195606 extends AbstractMigration implements ContainerAwareInterface
14{
15 /**
16 * @var ContainerInterface
17 */
18 private $container;
19
20 public function setContainer(ContainerInterface $container = null)
21 {
22 $this->container = $container;
23 }
24
25 /**
26 * @param Schema $schema
27 */
28 public function up(Schema $schema)
29 {
30 $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
31
32 switch ($this->connection->getDatabasePlatform()->getName()) {
33 case 'mysql':
34 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11) NOT NULL;');
35 break;
36 case 'postgresql':
37 $this->addSql('UPDATE ' . $this->getTable('entry') . ' SET reading_time = 0 WHERE reading_time IS NULL;');
38 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER COLUMN reading_time SET NOT NULL;');
39 break;
40 }
41 }
42
43 /**
44 * @param Schema $schema
45 */
46 public function down(Schema $schema)
47 {
48 $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
49
50 switch ($this->connection->getDatabasePlatform()->getName()) {
51 case 'mysql':
52 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11);');
53 break;
54 case 'postgresql':
55 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER COLUMN reading_time DROP NOT NULL;');
56 break;
57 }
58 }
59
60 private function getTable($tableName)
61 {
62 return $this->container->getParameter('database_table_prefix') . $tableName;
63 }
64}
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 4367902e..cfb8db75 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -180,11 +180,11 @@ class Entry
180 /** 180 /**
181 * @var int 181 * @var int
182 * 182 *
183 * @ORM\Column(name="reading_time", type="integer", nullable=true) 183 * @ORM\Column(name="reading_time", type="integer", nullable=false)
184 * 184 *
185 * @Groups({"entries_for_user", "export_all"}) 185 * @Groups({"entries_for_user", "export_all"})
186 */ 186 */
187 private $readingTime; 187 private $readingTime = 0;
188 188
189 /** 189 /**
190 * @var string 190 * @var string