openstack/manila
Code Issues Proposed changes

Merge "Fix ShareGroup sqlalchemy model ShareGroupTypes relation." into stable/rocky

Browse Source
This commit is contained in:
Zuul 2018-10-23 15:41:58 +00:00 committed by Gerrit Code Review
commit 744a157e7e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manila/db/sqlalchemy/models.py
View File

@ -1085,10 +1085,10 @@ class ShareGroup(BASE, ManilaBase):
ShareGroupTypes, ShareGroupTypes,
backref="share_groups", backref="share_groups",
foreign_keys=share_group_type_id, foreign_keys=share_group_type_id,
primaryjoin='and_(' primaryjoin="and_("
'ShareGroup.share_group_type_id == ' "ShareGroup.share_group_type_id =="
'ShareGroupTypes.id,' "ShareGroupTypes.id,"
'ShareGroup.deleted == 0)') "ShareGroup.deleted == 'False')")
_availability_zone = orm.relationship( _availability_zone = orm.relationship(
"AvailabilityZone", "AvailabilityZone",
lazy='immediate', lazy='immediate',