openstack
/
keystone
Code Issues Proposed changes

Merge "Make fetching all foreign keys in a join"

This commit is contained in:
Zuul 2019-04-18 02:33:58 +00:00 committed by Gerrit Code Review
parent 7da5b3eac0 eb79ebdafb
commit a6b9d443bd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
keystone/identity/backends/sql_model.py
View File

@ -48,17 +48,17 @@ class User(sql.ModelBase, sql.ModelDictMixinWithExtras):
backref='user',
collection_class=collections.attribute_mapped_collection('option_id'))
local_user = orm.relationship('LocalUser', uselist=False,
single_parent=True, lazy='subquery',
single_parent=True, lazy='joined',
cascade='all,delete-orphan', backref='user')
federated_users = orm.relationship('FederatedUser',
single_parent=True,
lazy='subquery',
lazy='joined',
cascade='all,delete-orphan',
backref='user')
nonlocal_user = orm.relationship('NonLocalUser',
uselist=False,
single_parent=True,
lazy='subquery',
lazy='joined',
cascade='all,delete-orphan',
backref='user')
created_at = sql.Column(sql.DateTime, nullable=True)
@ -268,7 +268,7 @@ class LocalUser(sql.ModelBase, sql.ModelDictMixin):
passwords = orm.relationship('Password',
single_parent=True,
cascade='all,delete-orphan',
lazy='subquery',
lazy='joined',
backref='local_user',
order_by='Password.created_at_int')
failed_auth_count = sql.Column(sql.Integer, nullable=True)

1
keystone/tests/unit/test_backend_sql.py
View File

@ -716,6 +716,7 @@ class SqlIdentity(SqlTests,
# users fetched.
self.assertNotEqual(len(first_call_users), len(second_call_users))
self.assertEqual(first_call_counter, counter.calls)
self.assertEqual(3, counter.calls)
def test_check_project_depth(self):
# Create a 3 level project tree: