From 52a3f5b7635583ae6feb084b1db654b9c65caec2 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 22 Aug 2018 11:13:54 -0400 Subject: Pass desired array type from pg.array_agg to functions.array_agg Fixed the :func:`.postgresql.array_agg` function, which is a slightly altered version of the usual :func:`.functions.array_agg` function, to also accept an incoming "type" argument without forcing an ARRAY around it, essentially the same thing that was fixed for the generic function in 1.1 in :ticket:`4107`. Fixes: #4324 Change-Id: I399a29f59c945a217cdd22c65ff0325edea8ea65 --- test/dialect/postgresql/test_compiler.py | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'test/dialect/postgresql') diff --git a/test/dialect/postgresql/test_compiler.py b/test/dialect/postgresql/test_compiler.py index 66764fcc2..5c4d72c67 100644 --- a/test/dialect/postgresql/test_compiler.py +++ b/test/dialect/postgresql/test_compiler.py @@ -7,6 +7,7 @@ from sqlalchemy import testing from sqlalchemy import Sequence, Table, Column, Integer, update, String,\ func, MetaData, Enum, Index, and_, delete, select, cast, text, \ Text, null +from sqlalchemy import types as sqltypes from sqlalchemy.dialects.postgresql import ExcludeConstraint, array from sqlalchemy import exc, schema from sqlalchemy.dialects import postgresql @@ -16,6 +17,8 @@ from sqlalchemy.sql import table, column, operators, literal_column from sqlalchemy.sql import util as sql_util from sqlalchemy.util import u, OrderedDict from sqlalchemy.dialects.postgresql import aggregate_order_by, insert +from sqlalchemy.dialects.postgresql import array_agg as pg_array_agg +from sqlalchemy.dialects.postgresql import ARRAY as PG_ARRAY class SequenceTest(fixtures.TestBase, AssertsCompiledSQL): @@ -1097,6 +1100,40 @@ class CompileTest(fixtures.TestBase, AssertsCompiledSQL): "AS string_agg_1 FROM table1" ) + def test_pg_array_agg_implicit_pg_array(self): + + expr = pg_array_agg(column('data', Integer)) + assert isinstance(expr.type, PG_ARRAY) + is_(expr.type.item_type._type_affinity, Integer) + + def test_pg_array_agg_uses_base_array(self): + + expr = pg_array_agg(column('data', sqltypes.ARRAY(Integer))) + assert isinstance(expr.type, sqltypes.ARRAY) + assert not isinstance(expr.type, PG_ARRAY) + is_(expr.type.item_type._type_affinity, Integer) + + def test_pg_array_agg_uses_pg_array(self): + + expr = pg_array_agg(column('data', PG_ARRAY(Integer))) + assert isinstance(expr.type, PG_ARRAY) + is_(expr.type.item_type._type_affinity, Integer) + + def test_pg_array_agg_explicit_base_array(self): + + expr = pg_array_agg(column( + 'data', sqltypes.ARRAY(Integer)), type_=sqltypes.ARRAY(Integer)) + assert isinstance(expr.type, sqltypes.ARRAY) + assert not isinstance(expr.type, PG_ARRAY) + is_(expr.type.item_type._type_affinity, Integer) + + def test_pg_array_agg_explicit_pg_array(self): + + expr = pg_array_agg(column( + 'data', sqltypes.ARRAY(Integer)), type_=PG_ARRAY(Integer)) + assert isinstance(expr.type, PG_ARRAY) + is_(expr.type.item_type._type_affinity, Integer) + def test_aggregate_order_by_adapt(self): m = MetaData() table = Table('table1', m, Column('a', Integer), Column('b', Integer)) -- cgit v1.2.1