← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal-security

« back to all changes in this revision

Viewing changes to django/contrib/gis/db/models/sql/compiler.py

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2010-10-12 11:34:35 UTC
  • mfrom: (1.2.7 upstream)
  • mto: This revision was merged to the branch mainline in revision 30.
  • Revision ID: james.westby@ubuntu.com-20101012113435-9lnsrh0i3mxozbt0
Tags: upstream-1.2.3
Import upstream version 1.2.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/contrib/gis/db/models/sql/compiler.py
95
95
        return result
96
96
 
97
97
    def get_default_columns(self, with_aliases=False, col_aliases=None,
98
 
                            start_alias=None, opts=None, as_pairs=False):
 
98
            start_alias=None, opts=None, as_pairs=False, local_only=False):
99
99
        """
100
100
        Computes the default columns for selecting every field in the base
101
101
        model. Will sometimes be called to pull in related models (e.g. via
121
121
        if start_alias:
122
122
            seen = {None: start_alias}
123
123
        for field, model in opts.get_fields_with_model():
 
124
            if local_only and model is not None:
 
125
                continue
124
126
            if start_alias:
125
127
                try:
126
128
                    alias = seen[model]