diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-04-01 21:53:48 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-04-01 21:53:48 +0200 |
| commit | d6fa2f70ac3c798b28ce33c6c143f45c09c74062 (patch) | |
| tree | 40769c29279d189dfe0dbb8aa513122f9172ebde /app/config | |
| parent | 1a93ee423b072ec3bcb0c437cbf9b488bdea245c (diff) | |
| parent | 276a1e9d3fb7e83569d16bcb37a67607d4ace8be (diff) | |
| download | wallabag-d6fa2f70ac3c798b28ce33c6c143f45c09c74062.tar.gz wallabag-d6fa2f70ac3c798b28ce33c6c143f45c09c74062.tar.zst wallabag-d6fa2f70ac3c798b28ce33c6c143f45c09c74062.zip | |
Merge pull request #1165 from wallabag/v2-prefix-db
Prefix table
Diffstat (limited to 'app/config')
| -rw-r--r-- | app/config/config.yml | 5 | ||||
| -rw-r--r-- | app/config/parameters.yml.dist | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 367aa276..0807b06a 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
| @@ -75,7 +75,10 @@ doctrine: | |||
| 75 | 75 | ||
| 76 | orm: | 76 | orm: |
| 77 | auto_generate_proxy_classes: "%kernel.debug%" | 77 | auto_generate_proxy_classes: "%kernel.debug%" |
| 78 | auto_mapping: true | 78 | entity_managers: |
| 79 | default: | ||
| 80 | naming_strategy: wallabag_core.doctrine.prefixed_naming_strategy | ||
| 81 | auto_mapping: true | ||
| 79 | 82 | ||
| 80 | # Swiftmailer Configuration | 83 | # Swiftmailer Configuration |
| 81 | swiftmailer: | 84 | swiftmailer: |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 73318013..f80f65ad 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
| @@ -7,6 +7,7 @@ parameters: | |||
| 7 | database_user: root | 7 | database_user: root |
| 8 | database_password: ~ | 8 | database_password: ~ |
| 9 | database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" | 9 | database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" |
| 10 | database_table_prefix: wallabag_ | ||
| 10 | 11 | ||
| 11 | mailer_transport: smtp | 12 | mailer_transport: smtp |
| 12 | mailer_host: 127.0.0.1 | 13 | mailer_host: 127.0.0.1 |