Skip to content

Fix #319 #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix #319 #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aff711
Fix #319
StdCarrot Dec 4, 2020
d7e0dc9
Unit test for fix #319
Apr 14, 2022
5a328b7
Merge branch 'fix-319'
Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion sqlalchemy_utils/types/pg_composite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,10 @@ class CompositeType(UserDefinedType, SchemaType):
class comparator_factory(UserDefinedType.Comparator):
def __getattr__(self, key):
try:
type_ = self.type.typemap[key]
if key in self.type.column_map:
type_ = self.type.column_map[key].type
else:
type_ = self.type.typemap[key]
except KeyError:
raise KeyError(
"Type '%s' doesn't have an attribute: '%s'" % (
Expand All @@ -192,6 +195,7 @@ def __init__(self, name, columns):
SchemaType.__init__(self)
self.name = name
self.columns = columns
self.column_map = {col.name: col for col in columns}
if name in registered_composites:
self.type_cls = registered_composites[name].type_cls
else:
Expand Down
12 changes: 12 additions & 0 deletions tests/types/test_composite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,18 @@ def test_incomplete_dict(self, session, Account):
assert account.balance.currency is None
assert account.balance.amount == 15

def test_composite_attribute_query(self, session, Account):
account_query = session \
.query(Account) \
.filter(Account.balance.amount == 15)

raw_query = str(
account_query.statement
.compile(compile_kwargs={"literal_binds": True})
)
assert '(account.balance).amount = 15' in raw_query



@pytest.mark.skipif('i18n.babel is None')
@pytest.mark.usefixtures('postgresql_dsn')
Expand Down