Skip to content

Commit 5bfa2b8

Browse files
committed
use a unique database name
1 parent 7028747 commit 5bfa2b8

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

packages/django-google-spanner/tests/settings.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828

2929
PROJECT_ID = os.getenv("GOOGLE_CLOUD_PROJECT", "emulator-test-project")
3030

31-
# _get_test_db_name method in creation.py addes prefix of 'test_' to db name.
32-
DATABASE_NAME = os.getenv("DJANGO_SPANNER_DB", "django_test_db")
31+
# Lock a unique database name into the environment so utils.py sees the exact same name
32+
if "DJANGO_SPANNER_DB" not in os.environ:
33+
os.environ["DJANGO_SPANNER_DB"] = f"db_{uuid.uuid4().hex[:8]}"
34+
35+
DATABASE_NAME = os.environ["DJANGO_SPANNER_DB"]
3336

3437
DATABASES = {
3538
"default": {

packages/django-google-spanner/tests/system/django_spanner/utils.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@
2727
"GOOGLE_CLOUD_TESTS_SPANNER_INSTANCE", "spanner-django-python-systest"
2828
)
2929
PROJECT_ID = os.getenv("GOOGLE_CLOUD_PROJECT", "emulator-test-project")
30-
DATABASE_NAME = os.getenv("DJANGO_SPANNER_DB", "django_test_db")
30+
31+
# Lock a unique database name into the environment so settings.py sees the exact same name
32+
if "DJANGO_SPANNER_DB" not in os.environ:
33+
os.environ["DJANGO_SPANNER_DB"] = f"db_{uuid.uuid4().hex[:8]}"
34+
35+
DATABASE_NAME = os.environ["DJANGO_SPANNER_DB"]
3136

3237

3338
class Config(object):

0 commit comments

Comments
 (0)