From 6bc7e0bfa9cd284e439c3b7ea67ab53014ac2773 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 8 Jul 2019 15:46:35 -0400 Subject: Support multidimensional array literals in Postgresql Added support for multidimensional Postgresql array literals via nesting the :class:`.postgresql.array` object within another one. The multidimensional array type is detected automatically. Fixes: #4756 Change-Id: Ie2107ad3cf291112f6ca330dc90dc15a0a940cee --- lib/sqlalchemy/dialects/postgresql/array.py | 30 +++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/dialects/postgresql/array.py') diff --git a/lib/sqlalchemy/dialects/postgresql/array.py b/lib/sqlalchemy/dialects/postgresql/array.py index 594cd3a0c..81bde2a02 100644 --- a/lib/sqlalchemy/dialects/postgresql/array.py +++ b/lib/sqlalchemy/dialects/postgresql/array.py @@ -60,7 +60,7 @@ class array(expression.Tuple): array([1,2]) + array([3,4,5]) ]) - print stmt.compile(dialect=postgresql.dialect()) + print(stmt.compile(dialect=postgresql.dialect())) Produces the SQL:: @@ -73,6 +73,24 @@ class array(expression.Tuple): array(['foo', 'bar'], type_=CHAR) + Multidimensional arrays are produced by nesting :class:`.array` constructs. + The dimensionality of the final :class:`.ARRAY` type is calculated by + recursively adding the dimensions of the inner :class:`.ARRAY` type:: + + stmt = select([ + array([ + array([1, 2]), array([3, 4]), array([column('q'), column('x')]) + ]) + ]) + print(stmt.compile(dialect=postgresql.dialect())) + + Produces:: + + SELECT ARRAY[ARRAY[%(param_1)s, %(param_2)s], + ARRAY[%(param_3)s, %(param_4)s], ARRAY[q, x]] AS anon_1 + + .. versionadded:: 1.3.6 added support for multidimensional array literals + .. seealso:: :class:`.postgresql.ARRAY` @@ -83,7 +101,15 @@ class array(expression.Tuple): def __init__(self, clauses, **kw): super(array, self).__init__(*clauses, **kw) - self.type = ARRAY(self.type) + if isinstance(self.type, ARRAY): + self.type = ARRAY( + self.type.item_type, + dimensions=self.type.dimensions + 1 + if self.type.dimensions is not None + else 2, + ) + else: + self.type = ARRAY(self.type) def _bind_param(self, operator, obj, _assume_scalar=False, type_=None): if _assume_scalar or operator is operators.getitem: -- cgit v1.2.1