From e776dd2db677d58dcb50aea20d3bb191537df25b Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Tue, 25 Apr 2017 06:01:25 +0200 Subject: Fixed #28116 -- Used error code filtering in PostgreSQL test database creation. Thanks Claude Paroz and Tim Graham for reviews. --- django/db/backends/postgresql/creation.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'django/db/backends/postgresql') diff --git a/django/db/backends/postgresql/creation.py b/django/db/backends/postgresql/creation.py index 27963e9462..a233758eea 100644 --- a/django/db/backends/postgresql/creation.py +++ b/django/db/backends/postgresql/creation.py @@ -1,5 +1,7 @@ import sys +from psycopg2 import errorcodes + from django.db.backends.base.creation import BaseDatabaseCreation @@ -32,9 +34,8 @@ class DatabaseCreation(BaseDatabaseCreation): try: super()._execute_create_test_db(cursor, parameters, keepdb) except Exception as e: - exc_msg = 'database %s already exists' % parameters['dbname'] - if exc_msg not in str(e): - # All errors except "database already exists" cancel tests + if getattr(e.__cause__, 'pgcode', '') != errorcodes.DUPLICATE_DATABASE: + # All errors except "database already exists" cancel tests. sys.stderr.write('Got an error creating the test database: %s\n' % e) sys.exit(2) elif not keepdb: -- cgit v1.3