diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-26 20:02:15 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-28 22:04:54 +0100 |
| commit | 1b6b77f02956a767fb3fa9825a7b97b4879f7d42 (patch) | |
| tree | f457bd812b3aa805832dd77d8a9b247c50c60cf9 /app | |
| parent | db9b6d8d0d9f943fe321ea690701662dac828e94 (diff) | |
| download | wallabag-1b6b77f02956a767fb3fa9825a7b97b4879f7d42.tar.gz wallabag-1b6b77f02956a767fb3fa9825a7b97b4879f7d42.tar.zst wallabag-1b6b77f02956a767fb3fa9825a7b97b4879f7d42.zip | |
Remove custom Postgres class
Because PG > 10 is now supported by DBAL >= 2.6.0
Diffstat (limited to 'app')
| -rw-r--r-- | app/config/config.yml | 1 | ||||
| -rw-r--r-- | app/config/config_test.yml | 1 | ||||
| -rw-r--r-- | app/config/parameters.yml.dist | 2 | ||||
| -rw-r--r-- | app/config/parameters_test.yml | 1 | ||||
| -rw-r--r-- | app/config/tests/parameters_test.mysql.yml | 1 | ||||
| -rw-r--r-- | app/config/tests/parameters_test.pgsql.yml | 1 | ||||
| -rw-r--r-- | app/config/tests/parameters_test.sqlite.yml | 1 |
7 files changed, 0 insertions, 8 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 092f3ec0..ee0f0a38 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
| @@ -46,7 +46,6 @@ twig: | |||
| 46 | doctrine: | 46 | doctrine: |
| 47 | dbal: | 47 | dbal: |
| 48 | driver: "%database_driver%" | 48 | driver: "%database_driver%" |
| 49 | driver_class: "%database_driver_class%" | ||
| 50 | host: "%database_host%" | 49 | host: "%database_host%" |
| 51 | port: "%database_port%" | 50 | port: "%database_port%" |
| 52 | dbname: "%database_name%" | 51 | dbname: "%database_name%" |
diff --git a/app/config/config_test.yml b/app/config/config_test.yml index 11e0feb7..216f8431 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml | |||
| @@ -24,7 +24,6 @@ swiftmailer: | |||
| 24 | doctrine: | 24 | doctrine: |
| 25 | dbal: | 25 | dbal: |
| 26 | driver: "%test_database_driver%" | 26 | driver: "%test_database_driver%" |
| 27 | driver_class: "%test_database_driver_class%" | ||
| 28 | host: "%test_database_host%" | 27 | host: "%test_database_host%" |
| 29 | port: "%test_database_port%" | 28 | port: "%test_database_port%" |
| 30 | dbname: "%test_database_name%" | 29 | dbname: "%test_database_name%" |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index d21f20e0..13e2584f 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
| @@ -11,8 +11,6 @@ parameters: | |||
| 11 | # database_password: %env.database_password% | 11 | # database_password: %env.database_password% |
| 12 | 12 | ||
| 13 | database_driver: pdo_mysql | 13 | database_driver: pdo_mysql |
| 14 | database_driver_class: ~ | ||
| 15 | # database_driver_class: Wallabag\CoreBundle\Doctrine\DBAL\Driver\CustomPostgreSQLDriver | ||
| 16 | database_host: 127.0.0.1 | 14 | database_host: 127.0.0.1 |
| 17 | database_port: ~ | 15 | database_port: ~ |
| 18 | database_name: wallabag | 16 | database_name: wallabag |
diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 64e51976..257d2ace 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml | |||
| @@ -8,4 +8,3 @@ parameters: | |||
| 8 | test_database_path: "%env(TEST_DATABASE_PATH)%" | 8 | test_database_path: "%env(TEST_DATABASE_PATH)%" |
| 9 | env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite" | 9 | env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite" |
| 10 | test_database_charset: utf8 | 10 | test_database_charset: utf8 |
| 11 | test_database_driver_class: ~ | ||
diff --git a/app/config/tests/parameters_test.mysql.yml b/app/config/tests/parameters_test.mysql.yml index 0b7b82eb..36b227fb 100644 --- a/app/config/tests/parameters_test.mysql.yml +++ b/app/config/tests/parameters_test.mysql.yml | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | parameters: | 1 | parameters: |
| 2 | test_database_driver: pdo_mysql | 2 | test_database_driver: pdo_mysql |
| 3 | test_database_driver_class: ~ | ||
| 4 | test_database_host: localhost | 3 | test_database_host: localhost |
| 5 | test_database_port: 3306 | 4 | test_database_port: 3306 |
| 6 | test_database_name: wallabag_test | 5 | test_database_name: wallabag_test |
diff --git a/app/config/tests/parameters_test.pgsql.yml b/app/config/tests/parameters_test.pgsql.yml index ea249324..60f51df6 100644 --- a/app/config/tests/parameters_test.pgsql.yml +++ b/app/config/tests/parameters_test.pgsql.yml | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | parameters: | 1 | parameters: |
| 2 | test_database_driver: pdo_pgsql | 2 | test_database_driver: pdo_pgsql |
| 3 | test_database_driver_class: Wallabag\CoreBundle\Doctrine\DBAL\Driver\CustomPostgreSQLDriver | ||
| 4 | test_database_host: localhost | 3 | test_database_host: localhost |
| 5 | test_database_port: | 4 | test_database_port: |
| 6 | test_database_name: wallabag_test | 5 | test_database_name: wallabag_test |
diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml index 64cd984b..2b92d579 100644 --- a/app/config/tests/parameters_test.sqlite.yml +++ b/app/config/tests/parameters_test.sqlite.yml | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | parameters: | 1 | parameters: |
| 2 | test_database_driver: pdo_sqlite | 2 | test_database_driver: pdo_sqlite |
| 3 | test_database_driver_class: ~ | ||
| 4 | test_database_host: localhost | 3 | test_database_host: localhost |
| 5 | test_database_port: | 4 | test_database_port: |
| 6 | test_database_name: ~ | 5 | test_database_name: ~ |