Merge "Allow Declarative to extract class attr from field"

2 files changed, 25 insertions, 14 deletions

diff --git a/lib/sqlalchemy/orm/decl_base.py b/lib/sqlalchemy/orm/decl_base.py
index 8da326b0e..353f44e43 100644
--- a/lib/sqlalchemy/orm/decl_base.py
+++ b/lib/sqlalchemy/orm/decl_base.py
@@ -334,6 +334,9 @@ class _ClassScanMapperConfig(_MapperConfig):
         tablename = None
 
         for base in cls.__mro__:
+
+            sa_dataclass_metadata_key = None
+
             class_mapped = (
                 base is not cls
                 and _declared_mapping_info(base) is not None
@@ -342,10 +345,25 @@ class _ClassScanMapperConfig(_MapperConfig):
                 )
             )
 
+            if sa_dataclass_metadata_key is None:
+                sa_dataclass_metadata_key = _get_immediate_cls_attr(
+                    base, "__sa_dataclass_metadata_key__", None
+                )
+
+            def attributes_for_class(cls):
+                for name, obj in vars(cls).items():
+                    yield name, obj
+                if sa_dataclass_metadata_key:
+                    for field in util.dataclass_fields(cls):
+                        if sa_dataclass_metadata_key in field.metadata:
+                            yield field.name, field.metadata[
+                                sa_dataclass_metadata_key
+                            ]
+
             if not class_mapped and base is not cls:
-                self._produce_column_copies(base)
+                self._produce_column_copies(attributes_for_class, base)
 
-            for name, obj in vars(base).items():
+            for name, obj in attributes_for_class(base):
                 if name == "__mapper_args__":
                     check_decl = _check_declared_props_nocascade(
                         obj, name, cls
@@ -452,6 +470,8 @@ class _ClassScanMapperConfig(_MapperConfig):
                     # however, check for some more common mistakes
                     else:
                         self._warn_for_decl_attributes(base, name, obj)
+                elif name not in dict_ or dict_[name] is not obj:
+                    dict_[name] = obj
 
         if inherited_table_args and not tablename:
             table_args = None
@@ -469,12 +489,12 @@ class _ClassScanMapperConfig(_MapperConfig):
                 % (key, cls)
             )
 
-    def _produce_column_copies(self, base):
+    def _produce_column_copies(self, attributes_for_class, base):
         cls = self.cls
         dict_ = self.dict_
         column_copies = self.column_copies
         # copy mixin columns to the mapped class
-        for name, obj in vars(base).items():
+        for name, obj in attributes_for_class(base):
             if isinstance(obj, Column):
                 if getattr(cls, name) is not obj:
                     # if column has been overridden
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index e50183894..e8f98d150 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -56,12 +56,6 @@ from ..sql import util as sql_util
 from ..sql import visitors
 from ..util import HasMemoized
 
-try:
-    import dataclasses
-except ImportError:
-    # The dataclasses module was added in Python 3.7
-    dataclasses = None
-
 
 _mapper_registry = weakref.WeakKeyDictionary()
 _already_compiling = False
@@ -2645,10 +2639,7 @@ class Mapper(
 
     @HasMemoized.memoized_attribute
     def _dataclass_fields(self):
-        if dataclasses is None or not dataclasses.is_dataclass(self.class_):
-            return frozenset()
-
-        return {field.name for field in dataclasses.fields(self.class_)}
+        return [f.name for f in util.dataclass_fields(self.class_)]
 
     def _should_exclude(self, name, assigned_name, local, column):
         """determine whether a particular property should be implicitly