diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-10-23 11:09:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-23 11:09:17 +0200 |
commit | 1953a872932a63792293b4aec087880265ba89f7 (patch) | |
tree | fd16599e737fcdaf193c933ef3ec4a4ee248b117 /app/DoctrineMigrations/Version20161024212538.php | |
parent | d83d25dadec2c38460a32d96f5d2903426fec9d3 (diff) | |
parent | 702f2d67d60ca963492b90dad74cb5f8dcc84e51 (diff) | |
download | wallabag-1953a872932a63792293b4aec087880265ba89f7.tar.gz wallabag-1953a872932a63792293b4aec087880265ba89f7.tar.zst wallabag-1953a872932a63792293b4aec087880265ba89f7.zip |
Merge pull request #3011 from wallabag/2.3
wallabag 2.3.0
Diffstat (limited to 'app/DoctrineMigrations/Version20161024212538.php')
-rw-r--r-- | app/DoctrineMigrations/Version20161024212538.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/DoctrineMigrations/Version20161024212538.php b/app/DoctrineMigrations/Version20161024212538.php index ecb872d1..698819be 100644 --- a/app/DoctrineMigrations/Version20161024212538.php +++ b/app/DoctrineMigrations/Version20161024212538.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added user_id column on oauth2_clients to prevent users to delete API clients from other users | 11 | * Added user_id column on oauth2_clients to prevent users to delete API clients from other users. |
12 | */ | 12 | */ |
13 | class Version20161024212538 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20161024212538 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
@@ -24,11 +24,6 @@ class Version20161024212538 extends AbstractMigration implements ContainerAwareI | |||
24 | $this->container = $container; | 24 | $this->container = $container; |
25 | } | 25 | } |
26 | 26 | ||
27 | private function getTable($tableName) | ||
28 | { | ||
29 | return $this->container->getParameter('database_table_prefix').$tableName; | ||
30 | } | ||
31 | |||
32 | /** | 27 | /** |
33 | * @param Schema $schema | 28 | * @param Schema $schema |
34 | */ | 29 | */ |
@@ -60,8 +55,13 @@ class Version20161024212538 extends AbstractMigration implements ContainerAwareI | |||
60 | 55 | ||
61 | $clientsTable->dropColumn('user_id', 'integer'); | 56 | $clientsTable->dropColumn('user_id', 'integer'); |
62 | 57 | ||
63 | if ($this->connection->getDatabasePlatform()->getName() != 'sqlite') { | 58 | if ('sqlite' !== $this->connection->getDatabasePlatform()->getName()) { |
64 | $clientsTable->removeForeignKey($this->constraintName); | 59 | $clientsTable->removeForeignKey($this->constraintName); |
65 | } | 60 | } |
66 | } | 61 | } |
62 | |||
63 | private function getTable($tableName) | ||
64 | { | ||
65 | return $this->container->getParameter('database_table_prefix') . $tableName; | ||
66 | } | ||
67 | } | 67 | } |