Skip to content
This repository was archived by the owner on May 5, 2025. It is now read-only.

Commit e30c1c7

Browse files
fix: remove test_analytics database (#574)
we'll just use the default as it's probably faster, but we won't get to scale TA DB separately
1 parent 284b92c commit e30c1c7

File tree

4 files changed

+3
-87
lines changed

4 files changed

+3
-87
lines changed

shared/django_apps/db_routers/__init__.py

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ def db_for_read(self, model, **hints):
1818
return "timeseries_read"
1919
else:
2020
return "timeseries"
21-
case "test_analytics":
22-
return "test_analytics"
2321
case _:
2422
if settings.DATABASE_READ_REPLICA_ENABLED:
2523
return "default_read"
@@ -30,34 +28,25 @@ def db_for_write(self, model, **hints):
3028
match model._meta.app_label:
3129
case "timeseries":
3230
return "timeseries"
33-
case "test_analytics":
34-
return "test_analytics"
3531
case _:
3632
return "default"
3733

3834
def allow_migrate(self, db, app_label, model_name=None, **hints):
3935
match db:
40-
case "timeseries_read" | "test_analytics_read" | "default_read":
36+
case "timeseries_read" | "default_read":
4137
return False
4238
case "timeseries":
4339
if not settings.TIMESERIES_ENABLED:
4440
return False
4541
return app_label == "timeseries"
46-
case "test_analytics":
47-
if not settings.TEST_ANALYTICS_DATABASE_ENABLED:
48-
return False
49-
return app_label == "test_analytics"
5042
case _:
51-
return app_label not in {"timeseries", "test_analytics"}
43+
return app_label not in {"timeseries"}
5244

5345
def allow_relation(self, obj1, obj2, **hints):
5446
obj1_app = obj1._meta.app_label
5547
obj2_app = obj2._meta.app_label
5648

57-
if obj1_app in {"timeseries", "test_analytics"} or obj2_app in {
58-
"timeseries",
59-
"test_analytics",
60-
}:
49+
if obj1_app in {"timeseries"} or obj2_app in {"timeseries"}:
6150
return obj1_app == obj2_app
6251
else:
6352
return True

shared/django_apps/db_settings.py

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -158,47 +158,6 @@
158158
"CONN_MAX_AGE": CONN_MAX_AGE,
159159
}
160160

161-
TEST_ANALYTICS_DATABASE_ENABLED = get_config(
162-
"setup", "test_analytics_database", "enabled", default=True
163-
)
164-
165-
test_analytics_database_url = get_config("services", "test_analytics_database_url")
166-
if test_analytics_database_url:
167-
test_analytics_database_conf = urlparse(test_analytics_database_url)
168-
TEST_ANALYTICS_DATABASE_NAME = test_analytics_database_conf.path.replace("/", "")
169-
TEST_ANALYTICS_DATABASE_USER = test_analytics_database_conf.username
170-
TEST_ANALYTICS_DATABASE_PASSWORD = test_analytics_database_conf.password
171-
TEST_ANALYTICS_DATABASE_HOST = test_analytics_database_conf.hostname
172-
TEST_ANALYTICS_DATABASE_PORT = test_analytics_database_conf.port
173-
else:
174-
TEST_ANALYTICS_DATABASE_NAME = get_config(
175-
"services", "test_analytics_database", "name", default="test_analytics"
176-
)
177-
TEST_ANALYTICS_DATABASE_USER = get_config(
178-
"services", "test_analytics_database", "username", default="postgres"
179-
)
180-
TEST_ANALYTICS_DATABASE_PASSWORD = get_config(
181-
"services", "test_analytics_database", "password", default="postgres"
182-
)
183-
TEST_ANALYTICS_DATABASE_HOST = get_config(
184-
"services", "test_analytics_database", "host", default="postgres"
185-
)
186-
TEST_ANALYTICS_DATABASE_PORT = get_config(
187-
"services", "test_analytics_database", "port", default=5432
188-
)
189-
190-
191-
if TEST_ANALYTICS_DATABASE_ENABLED:
192-
DATABASES["test_analytics"] = {
193-
"ENGINE": "psqlextra.backend",
194-
"NAME": TEST_ANALYTICS_DATABASE_NAME,
195-
"USER": TEST_ANALYTICS_DATABASE_USER,
196-
"PASSWORD": TEST_ANALYTICS_DATABASE_PASSWORD,
197-
"HOST": TEST_ANALYTICS_DATABASE_HOST,
198-
"PORT": TEST_ANALYTICS_DATABASE_PORT,
199-
"CONN_MAX_AGE": CONN_MAX_AGE,
200-
}
201-
202161

203162
# See https://django-postgres-extra.readthedocs.io/en/main/settings.html
204163
POSTGRES_EXTRA_DB_BACKEND_BASE: "django_prometheus.db.backends.postgresql" # type: ignore

shared/django_apps/dummy_settings.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,6 @@
9393
"HOST": "timescale",
9494
"PORT": 5432,
9595
},
96-
"test_analytics": {
97-
"ENGINE": "psqlextra.backend",
98-
"NAME": "test_analytics",
99-
"USER": "postgres",
100-
"PASSWORD": "postgres",
101-
"HOST": "postgres",
102-
"PORT": 5432,
103-
},
10496
}
10597

10698
# Password validation

tests/unit/django_apps/test_db_routers.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -65,30 +65,6 @@ def test_allow_migrate_timeseries_disabled(self):
6565
assert router.allow_migrate("default", "timeseries") == False
6666
assert router.allow_migrate("default_read", "timeseries") == False
6767

68-
@override_settings(TEST_ANALYTICS_DATABASE_ENABLED=False)
69-
def test_allow_migrate_test_analytics_disabled(self):
70-
router = MultiDatabaseRouter()
71-
assert router.allow_migrate("test_analytics", "test_analytics") == False
72-
assert router.allow_migrate("test_analytics_read", "test_analytics") == False
73-
assert router.allow_migrate("test_analytics", "default") == False
74-
assert router.allow_migrate("test_analytics_read", "default") == False
75-
assert router.allow_migrate("default", "default") == True
76-
assert router.allow_migrate("default_read", "default") == False
77-
assert router.allow_migrate("default", "test_analytics") == False
78-
assert router.allow_migrate("default_read", "test_analytics") == False
79-
80-
@override_settings(TEST_ANALYTICS_DATABASE_ENABLED=True)
81-
def test_allow_migrate_test_analytics_enabled(self):
82-
router = MultiDatabaseRouter()
83-
assert router.allow_migrate("test_analytics", "test_analytics") == True
84-
assert router.allow_migrate("test_analytics_read", "test_analytics") == False
85-
assert router.allow_migrate("test_analytics", "default") == False
86-
assert router.allow_migrate("test_analytics_read", "default") == False
87-
assert router.allow_migrate("default", "default") == True
88-
assert router.allow_migrate("default_read", "default") == False
89-
assert router.allow_migrate("default", "test_analytics") == False
90-
assert router.allow_migrate("default_read", "test_analytics") == False
91-
9268
def test_allow_relation(self, mocker):
9369
# At time of writing, the Django timeseries models don't live in this
9470
# repo so we're pretending a different model is from the timeseries app

0 commit comments

Comments
 (0)