diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-03-25 11:39:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-03-25 11:39:13 +0000 |
| commit | 5682b9a24d4174f429204638ec90622b52035cdc (patch) | |
| tree | 43d55d1c18308b3d2ead7a17c257f11b492aecf5 /lib | |
| parent | 9d3e43333db23959bc2d83a1d5ba0364aa81b21a (diff) | |
| parent | 346e2bc0a64f5d451d951d04a7ee36b1dd7ea8fa (diff) | |
| download | sqlalchemy-5682b9a24d4174f429204638ec90622b52035cdc.tar.gz | |
Merge "Use class-local metadata for declarative base"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/orm/decl_base.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/decl_base.py b/lib/sqlalchemy/orm/decl_base.py index e55056fdf..5a5d98a95 100644 --- a/lib/sqlalchemy/orm/decl_base.py +++ b/lib/sqlalchemy/orm/decl_base.py @@ -783,7 +783,7 @@ class _ClassScanMapperConfig(_MapperConfig): "__table__", table_cls( tablename, - manager.registry.metadata, + self._metadata_for_cls(manager), *(tuple(declared_columns) + tuple(args)), **table_kw ), @@ -800,6 +800,12 @@ class _ClassScanMapperConfig(_MapperConfig): ) self.local_table = table + def _metadata_for_cls(self, manager): + if hasattr(self.cls, "metadata"): + return self.cls.metadata + else: + return manager.registry.metadata + def _setup_inheritance(self, mapper_kw): table = self.local_table cls = self.cls |