Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor some classes/methods #325

Merged
merged 2 commits into from
Apr 14, 2020
Merged

Refactor some classes/methods #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83de44a
Inherit tenant_context() from schema_context()
atodorov Dec 8, 2019
03a4149
Refactor set_schema() and set_schema_to_public()
atodorov Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 8 additions & 15 deletions django_tenants/postgresql_backend/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,6 @@ def set_tenant(self, tenant, include_public=True):
self.include_public_schema = include_public
self.set_settings_schema(self.schema_name)
self.search_path_set = False

def set_schema(self, schema_name, include_public=True):
"""
Main API method to current database schema,
but it does not actually modify the db connection.
"""
self.tenant = FakeTenant(schema_name=schema_name)
self.schema_name = schema_name
self.include_public_schema = include_public
self.set_settings_schema(schema_name)
self.search_path_set = False
# Content type can no longer be cached as public and tenant schemas
# have different models. If someone wants to change this, the cache
# needs to be separated between public and shared schemas. If this
Expand All @@ -94,14 +83,18 @@ def set_schema(self, schema_name, include_public=True):
# wrong model will be fetched.
ContentType.objects.clear_cache()

def set_schema(self, schema_name, include_public=True):
"""
Main API method to current database schema,
but it does not actually modify the db connection.
"""
self.set_tenant(FakeTenant(schema_name=schema_name), include_public)

def set_schema_to_public(self):
"""
Instructs to stay in the common 'public' schema.
"""
self.tenant = FakeTenant(schema_name=get_public_schema_name())
self.schema_name = get_public_schema_name()
self.set_settings_schema(self.schema_name)
self.search_path_set = False
self.set_tenant(FakeTenant(schema_name=get_public_schema_name()))

def set_settings_schema(self, schema_name):
self.settings_dict['SCHEMA'] = schema_name
Expand Down
16 changes: 2 additions & 14 deletions django_tenants/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,9 @@ def __exit__(self, *exc):
self.connection.set_tenant(self.previous_tenant)


class tenant_context(ContextDecorator):
class tenant_context(schema_context):
def __init__(self, *args, **kwargs):
self.tenant = args[0]
super().__init__()

def __enter__(self):
self.connection = connections[get_tenant_database_alias()]
self.previous_tenant = connection.tenant
self.connection.set_tenant(self.tenant)

def __exit__(self, *exc):
if self.previous_tenant is None:
self.connection.set_schema_to_public()
else:
self.connection.set_tenant(self.previous_tenant)
super().__init__(args[0].schema_name, **kwargs)


def clean_tenant_url(url_string):
Expand Down