Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
D
django
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
django
Commits
e776dd2d
Kaydet (Commit)
e776dd2d
authored
Nis 25, 2017
tarafından
Mariusz Felisiak
Kaydeden (comit)
GitHub
Nis 25, 2017
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fixed #28116 -- Used error code filtering in PostgreSQL test database creation.
Thanks Claude Paroz and Tim Graham for reviews.
üst
5e8625ba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
7 deletions
+19
-7
creation.py
django/db/backends/postgresql/creation.py
+4
-3
test_creation.py
tests/backends/test_creation.py
+15
-4
No files found.
django/db/backends/postgresql/creation.py
Dosyayı görüntüle @
e776dd2d
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
:
...
...
tests/backends/test_creation.py
Dosyayı görüntüle @
e776dd2d
...
...
@@ -12,11 +12,18 @@ from django.db.backends.mysql.creation import \
DatabaseCreation
as
MySQLDatabaseCreation
from
django.db.backends.oracle.creation
import
\
DatabaseCreation
as
OracleDatabaseCreation
from
django.db.backends.postgresql.creation
import
\
DatabaseCreation
as
PostgreSQLDatabaseCreation
from
django.db.utils
import
DatabaseError
from
django.test
import
SimpleTestCase
,
TestCase
try
:
import
psycopg2
# NOQA
except
ImportError
:
pass
else
:
from
psycopg2
import
errorcodes
from
django.db.backends.postgresql.creation
import
\
DatabaseCreation
as
PostgreSQLDatabaseCreation
class
TestDbSignatureTests
(
SimpleTestCase
):
...
...
@@ -98,10 +105,14 @@ class PostgreSQLDatabaseCreationTests(SimpleTestCase):
self
.
check_sql_table_creation_suffix
(
settings
,
'''WITH ENCODING 'UTF8' TEMPLATE "template0"'''
)
def
_execute_raise_database_already_exists
(
self
,
cursor
,
parameters
,
keepdb
=
False
):
raise
DatabaseError
(
'database
%
s already exists'
%
parameters
[
'dbname'
])
error
=
DatabaseError
(
'database
%
s already exists'
%
parameters
[
'dbname'
])
error
.
pgcode
=
errorcodes
.
DUPLICATE_DATABASE
raise
DatabaseError
()
from
error
def
_execute_raise_permission_denied
(
self
,
cursor
,
parameters
,
keepdb
=
False
):
raise
DatabaseError
(
'permission denied to create database'
)
error
=
DatabaseError
(
'permission denied to create database'
)
error
.
pgcode
=
errorcodes
.
INSUFFICIENT_PRIVILEGE
raise
DatabaseError
()
from
error
def
patch_test_db_creation
(
self
,
execute_create_test_db
):
return
mock
.
patch
.
object
(
BaseDatabaseCreation
,
'_execute_create_test_db'
,
execute_create_test_db
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment