← Back to branch summary

~ubuntu-branches/debian/sid/sqlalchemy/sid

« back to all changes in this revision

Viewing changes to lib/sqlalchemy/orm/query.py

  • Committer: Package Import Robot
  • Author(s): Piotr Ożarowski
  • Date: 2014-06-27 20:17:13 UTC
  • mfrom: (1.4.28)
  • Revision ID: package-import@ubuntu.com-20140627201713-g6p1kq8q1qenztrv
Tags: 0.9.6-1
http://bugs.debian.org/747852
http://bugs.debian.org/752145
* New upstream release
* Remove Python 3.X build tag files, thanks to Matthias Urlichs for the
  patch (closes: #747852)
* python-fdb isn't in the Debian archive yet so default dialect for firebird://
  URLs is changed to obsolete kinterbasdb, thanks to Russell Stuart for the
  patch (closes: #752145)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/sqlalchemy/orm/query.py
519
519
            parts_alias = aliased(Part, name="p")
520
520
            included_parts = included_parts.union_all(
521
521
                session.query(
 
522
                    parts_alias.sub_part,
522
523
                    parts_alias.part,
523
 
                    parts_alias.sub_part,
524
524
                    parts_alias.quantity).\\
525
525
                        filter(parts_alias.part==incl_alias.c.sub_part)
526
526
                )
1244
1244
            else:
1245
1245
                self._criterion = criterion
1246
1246
 
 
1247
 
1247
1248
    def filter_by(self, **kwargs):
1248
1249
        """apply the given filtering criterion to a copy
1249
1250
        of this :class:`.Query`, using keyword expressions.
2886
2887
                        order_by=context.order_by,
2887
2888
                        **self._select_args
2888
2889
                    )
2889
 
 
2890
2890
        statement._for_update_arg = context._for_update_arg
2891
2891
 
2892
2892
        for hint in self._with_hints: