Projet

Général

Profil

« Précédent | Suivant » 

Révision eaac238e

Ajouté par Thomas Noël il y a plus de 9 ans

multitenant: use self.schema_name in SyncCommon (#6420)

Voir les différences:

entrouvert/djommon/multitenant/management/commands/migrate_schemas.py
28 28
        super(MigrateSchemasCommand, self).handle(*args, **options)
29 29
        self.PUBLIC_SCHEMA_NAME = get_public_schema_name()
30 30

  
31
        if self.sync_public and not self.domain:
32
            self.domain = self.PUBLIC_SCHEMA_NAME
31
        if self.sync_public and not self.schema_name:
32
            self.schema_name = self.PUBLIC_SCHEMA_NAME
33 33

  
34 34
        if self.sync_public:
35
            self.run_migrations(self.domain, settings.SHARED_APPS)
35
            self.run_migrations(self.schema_name, settings.SHARED_APPS)
36 36
        if self.sync_tenant:
37
            if self.domain and self.domain != self.PUBLIC_SCHEMA_NAME:
38
                try:
39
                    tenant = TenantMiddleware.get_tenant_by_hostname(self.domain)
40
                except TenantNotFound:
41
                    raise RuntimeError('Schema "{}" does not exist'.format(
42
                        self.domain))
43
                else:
44
                    self.run_migrations(tenant.schema_name, settings.TENANT_APPS)
37
            if self.schema_name and self.schema_name != self.PUBLIC_SCHEMA_NAME:
38
                self.run_migrations(self.schema_name, settings.TENANT_APPS)
45 39
            else:
46 40
                all_tenants = TenantMiddleware.get_tenants()
47 41
                for tenant in all_tenants:

Formats disponibles : Unified diff