remove unused "descriptor" param from ColumnProperty

this appears to be unused and wasn't documented,
even though in the method sig for column_property().
just whack it

also repairs a typing issue in decl_base that seemed
to somehow not fail previously.

Change-Id: Id5c8e716b7e53715778921ab03707642cadbfdee

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/decl_base.py b/lib/sqlalchemy/orm/decl_base.py
index 6bd957de1..a66421e22 100644
--- a/lib/sqlalchemy/orm/decl_base.py
+++ b/lib/sqlalchemy/orm/decl_base.py
@@ -19,6 +19,7 @@ from typing import List
 from typing import Mapping
 from typing import NoReturn
 from typing import Optional
+from typing import Sequence
 from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
@@ -63,6 +64,7 @@ if TYPE_CHECKING:
     from ._typing import _RegistryType
     from .decl_api import declared_attr
     from .instrumentation import ClassManager
+    from ..sql.elements import NamedColumn
     from ..sql.schema import MetaData
     from ..sql.selectable import FromClause
 
@@ -228,7 +230,12 @@ class _MapperConfig:
 
     cls: Type[Any]
     classname: str
-    properties: util.OrderedDict[str, MapperProperty[Any]]
+    properties: util.OrderedDict[
+        str,
+        Union[
+            Sequence[NamedColumn[Any]], NamedColumn[Any], MapperProperty[Any]
+        ],
+    ]
     declared_attr_reg: Dict[declared_attr[Any], Any]
 
     @classmethod