devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove custom Postgres class 

Because PG > 10 is now supported by DBAL >= 2.6.0
This commit is contained in:
Jeremy Benoist 2018-11-26 20:02:15 +01:00
parent db9b6d8d0d
commit 1b6b77f029
No known key found for this signature in database
GPG Key ID: BCA73962457ACC3C
9 changed files with 0 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/config/config.yml
View File

@ -46,7 +46,6 @@ twig:
doctrine: doctrine:
dbal: dbal:
driver: "%database_driver%" driver: "%database_driver%"
driver_class: "%database_driver_class%"
host: "%database_host%" host: "%database_host%"
port: "%database_port%" port: "%database_port%"
dbname: "%database_name%" dbname: "%database_name%"

1
app/config/config_test.yml
View File

@ -24,7 +24,6 @@ swiftmailer:
doctrine: doctrine:
dbal: dbal:
driver: "%test_database_driver%" driver: "%test_database_driver%"
driver_class: "%test_database_driver_class%"
host: "%test_database_host%" host: "%test_database_host%"
port: "%test_database_port%" port: "%test_database_port%"
dbname: "%test_database_name%" dbname: "%test_database_name%"

2
app/config/parameters.yml.dist
View File

@ -11,8 +11,6 @@ parameters:
# database_password: %env.database_password% # database_password: %env.database_password%
database_driver: pdo_mysql database_driver: pdo_mysql
database_driver_class: ~
# database_driver_class: Wallabag\CoreBundle\Doctrine\DBAL\Driver\CustomPostgreSQLDriver
database_host: 127.0.0.1 database_host: 127.0.0.1
database_port: ~ database_port: ~
database_name: wallabag database_name: wallabag

1
app/config/parameters_test.yml
View File

@ -8,4 +8,3 @@ parameters:
test_database_path: "%env(TEST_DATABASE_PATH)%" test_database_path: "%env(TEST_DATABASE_PATH)%"
env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite" env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite"
test_database_charset: utf8 test_database_charset: utf8
test_database_driver_class: ~

1
app/config/tests/parameters_test.mysql.yml
View File

@ -1,6 +1,5 @@
parameters: parameters:
test_database_driver: pdo_mysql test_database_driver: pdo_mysql
test_database_driver_class: ~
test_database_host: localhost test_database_host: localhost
test_database_port: 3306 test_database_port: 3306
test_database_name: wallabag_test test_database_name: wallabag_test

1
app/config/tests/parameters_test.pgsql.yml
View File

@ -1,6 +1,5 @@
parameters: parameters:
test_database_driver: pdo_pgsql test_database_driver: pdo_pgsql
test_database_driver_class: Wallabag\CoreBundle\Doctrine\DBAL\Driver\CustomPostgreSQLDriver
test_database_host: localhost test_database_host: localhost
test_database_port: test_database_port:
test_database_name: wallabag_test test_database_name: wallabag_test

1
app/config/tests/parameters_test.sqlite.yml
View File

@ -1,6 +1,5 @@
parameters: parameters:
test_database_driver: pdo_sqlite test_database_driver: pdo_sqlite
test_database_driver_class: ~
test_database_host: localhost test_database_host: localhost
test_database_port: test_database_port:
test_database_name: ~ test_database_name: ~

25
src/Wallabag/CoreBundle/Doctrine/DBAL/Driver/CustomPostgreSQLDriver.php
View File

@ -1,25 +0,0 @@
<?php
namespace Wallabag\CoreBundle\Doctrine\DBAL\Driver;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Driver\PDOPgSql\Driver;
use Wallabag\CoreBundle\Doctrine\DBAL\Schema\CustomPostgreSqlSchemaManager;
/**
* This custom driver allow to use a different schema manager
* So we can fix the PostgreSQL 10 problem.
*
* @see https://github.com/wallabag/wallabag/issues/3479
* @see https://github.com/doctrine/dbal/issues/2868
*/
class CustomPostgreSQLDriver extends Driver
{
/**
* {@inheritdoc}
*/
public function getSchemaManager(Connection $conn)
{
return new CustomPostgreSqlSchemaManager($conn);
}
}

38
src/Wallabag/CoreBundle/Doctrine/DBAL/Schema/CustomPostgreSqlSchemaManager.php
View File

@ -1,38 +0,0 @@
<?php
namespace Wallabag\CoreBundle\Doctrine\DBAL\Schema;
use Doctrine\DBAL\Schema\PostgreSqlSchemaManager;
use Doctrine\DBAL\Schema\Sequence;
/**
* This custom schema manager fix the PostgreSQL 10 problem.
*
* @see https://github.com/wallabag/wallabag/issues/3479
* @see https://github.com/doctrine/dbal/issues/2868
*/
class CustomPostgreSqlSchemaManager extends PostgreSqlSchemaManager
{
/**
* {@inheritdoc}
*/
protected function _getPortableSequenceDefinition($sequence)
{
$sequenceName = $sequence['relname'];
if ('public' !== $sequence['schemaname']) {
$sequenceName = $sequence['schemaname'] . '.' . $sequence['relname'];
}
$query = 'SELECT min_value, increment_by FROM ' . $this->_platform->quoteIdentifier($sequenceName);
// the `method_exists` is only to avoid test to fail:
// DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticConnection doesn't support the `getServerVersion`
if (method_exists($this->_conn->getWrappedConnection(), 'getServerVersion') && (float) ($this->_conn->getWrappedConnection()->getServerVersion()) >= 10) {
$query = "SELECT min_value, increment_by FROM pg_sequences WHERE schemaname = 'public' AND sequencename = " . $this->_conn->quote($sequenceName);
}
$data = $this->_conn->fetchAll($query);
return new Sequence($sequenceName, $data[0]['increment_by'], $data[0]['min_value']);
}
}