Merge "Improve array_agg and Array processing" into main

3 files changed, 16 insertions, 1 deletions

diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index a028e7fed..c04f5fa1d 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -1407,7 +1407,9 @@ class array_agg(GenericFunction[_T]):
             if isinstance(type_from_args, sqltypes.ARRAY):
                 kwargs["type_"] = type_from_args
             else:
-                kwargs["type_"] = default_array_type(type_from_args)
+                kwargs["type_"] = default_array_type(
+                    type_from_args, dimensions=1
+                )
         kwargs["_parsed_args"] = fn_args
         super(array_agg, self).__init__(*fn_args, **kwargs)
 
diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index fd52ec6ea..414ff03c3 100644
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -3065,6 +3065,8 @@ class ARRAY(
                     dim - 1 if dim is not None else None,
                     collection_callable,
                 )
+                if x is not None
+                else None
                 for x in arr
             )
 
diff --git a/lib/sqlalchemy/testing/config.py b/lib/sqlalchemy/testing/config.py
index e418b48be..1cb463977 100644
--- a/lib/sqlalchemy/testing/config.py
+++ b/lib/sqlalchemy/testing/config.py
@@ -13,6 +13,8 @@ import collections
 import typing
 from typing import Any
 from typing import Iterable
+from typing import Optional
+from typing import overload
 from typing import Tuple
 from typing import Union
 
@@ -37,6 +39,15 @@ else:
     _fixture_functions = None  # installed by plugin_base
 
 
+@overload
+def combinations(
+    *comb: Union[Any, Tuple[Any, ...]],
+    argnames: Optional[str] = None,
+    id_: Optional[str] = None,
+):
+    ...
+
+
 def combinations(*comb: Union[Any, Tuple[Any, ...]], **kw: str):
     r"""Deliver multiple versions of a test based on positional combinations.