pi-ux-ce/Django_kube
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

reverting and merging into streaming app instead
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 2s
Details

Browse Source
This commit is contained in:
pi-ux-ce
2026-08-07 12:00:32 +01:00
parent 7a1021edfa
commit 2b410b5ff8
14 changed files with 23 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_code/core/routers.py
+3 -12
View File
@@ -30,9 +30,6 @@ class ProjectDatabaseRouter:
if model._meta.app_label == 'streaming':
return 'streaming_db'
if model._meta.app_label == 'streaming_redirect':
return 'streaming_redirect_db'
return 'default'
def db_for_write(self, model, **hints):
@@ -59,17 +56,14 @@ class ProjectDatabaseRouter:
if model._meta.app_label == 'streaming':
return 'streaming_db'
if model._meta.app_label == 'streaming_redirect':
return 'streaming_redirect_db'
return 'default'
def allow_relation(self, obj1, obj2, **hints):
"""Allow relations if both models are in the same database."""
# Prevents accidental foreign key relationships across different physical DBs
if (
obj1._meta.app_label in ['cloudmanager', 'simpsons', 'redirect', 'job', 'telegram', 'podcast', 'streaming', 'streaming_redirect'] or
obj2._meta.app_label in ['cloudmanager', 'simpsons', 'redirect', 'job', 'telegram', 'podcast', 'streaming', 'streaming_redirect']
obj1._meta.app_label in ['cloudmanager', 'simpsons', 'redirect', 'job', 'telegram', 'podcast', 'streaming'] or
obj2._meta.app_label in ['cloudmanager', 'simpsons', 'redirect', 'job', 'telegram', 'podcast', 'streaming']
):
return obj1._meta.app_label == obj2._meta.app_label
return None
@@ -98,11 +92,8 @@ class ProjectDatabaseRouter:
if app_label == 'streaming':
return db == 'streaming_db'
if app_label == 'streaming_redirect':
return db == 'streaming_redirect_db'
# Ensure default Django apps (auth, sessions, etc.) don't migrate into simpsons/cloudmanager
if db in ['cloudmanager_db', 'simpsons_db', 'redirect_db', 'job_db', 'telegram_db', 'podcast_db', 'streaming_db', 'streaming_redirect_db']:
if db in ['cloudmanager_db', 'simpsons_db', 'redirect_db', 'job_db', 'telegram_db', 'podcast_db', 'streaming_db']:
return False
return None
django_code/core/settings.py
+1 -9
View File
@@ -51,7 +51,6 @@ INSTALLED_APPS = [
'apps.telegram_communication.apps.TelegramCommunicationConfig',
'apps.podcast_aggregator.apps.PodcastAggregatorConfig',
'apps.streaming.apps.StreamingConfig',
'apps.streaming_redirect.apps.StreamingRedirectConfig',
'import_export',
'djangoql',
]
@@ -164,14 +163,7 @@ DATABASES = {
'HOST': os.environ.get('DB_HOST'),
'PORT': os.environ.get('DB_PORT'),
},
'streaming_redirect_db': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'streaming_redirect',
'USER': os.environ.get('DB_USERNAME'),
'PASSWORD': os.environ.get('DB_PASSWORD'),
'HOST': os.environ.get('DB_HOST'),
'PORT': os.environ.get('DB_PORT'),
},
}
DATABASE_ROUTERS = ['core.routers.ProjectDatabaseRouter']
#DATABASE_ROUTERS = []