← Back to branch summary

~rakhmerov/mistral/master

« back to all changes in this revision

Viewing changes to mistral/db/v2/sqlalchemy/api.py

  • Committer: Gerrit Code Review
  • Author(s): Zuul
  • Date: 2018-04-12 06:17:56 UTC
  • mfrom: (2042.1.1)
  • Revision ID: git-v1:e9d6df039d52d4df4445634c998dae9e3d90df66
Merge "Fix call to model_query in sqlalchemy.api._get_collection"

Show diffs side-by-side

added added

removed removed

Lines of Context:
mistral/db/v2/sqlalchemy/api.py
259
259
        if fields else ()
260
260
    )
261
261
 
262
 
    query = (b.model_query(model, *columns) if insecure
 
262
    query = (b.model_query(model, columns=columns) if insecure
263
263
             else _secure_query(model, *columns))
264
264
    query = db_filters.apply_filters(query, model, **filters)
265
265