ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3988 from jsaalfeld/fix_postgres_migration

Browse Source 
fixing #3987 - postgreSQL migration possible again
This commit is contained in:
Jochen Saalfeld 2018-11-07 08:34:11 +01:00 committed by GitHub
commit 22d436b6b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/core/apps.py
View File

@ -6,7 +6,7 @@ from django.apps import AppConfig
from django.conf import settings from django.conf import settings
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.db.models.signals import post_migrate from django.db.models.signals import post_migrate
from django.db.utils import OperationalError from django.db.utils import OperationalError, ProgrammingError
from ..utils.projector import register_projector_elements from ..utils.projector import register_projector_elements
@ -53,7 +53,7 @@ class CoreAppConfig(AppConfig):
# Set constants # Set constants
try: try:
set_constants(get_constants_from_apps()) set_constants(get_constants_from_apps())
except (ImproperlyConfigured, OperationalError): except (ImproperlyConfigured, OperationalError, ProgrammingError):
# Database is not loaded. This happens in tests and migrations. # Database is not loaded. This happens in tests and migrations.
pass pass
@ -81,7 +81,7 @@ class CoreAppConfig(AppConfig):
# Sets the cache # Sets the cache
try: try:
element_cache.ensure_cache() element_cache.ensure_cache()
except (ImproperlyConfigured, OperationalError): except (ImproperlyConfigured, OperationalError, ProgrammingError):
# This happens in the tests or in migrations. Do nothing # This happens in the tests or in migrations. Do nothing
pass pass