Commit 7cfb567e authored by Anssi Kääriäinen's avatar Anssi Kääriäinen
Browse files

Another regression fix for select_related handling 

This time gis compiler.get_default_columns() wasn't up to date. Thanks
to CI another regression fixed.

Refs #13781
parent 1194a969

django/contrib/gis/db/models/sql/compiler.py

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ class GeoSQLCompiler(compiler.SQLCompiler): 
        return result



    def get_default_columns(self, with_aliases=False, col_aliases=None,

            start_alias=None, opts=None, as_pairs=False, local_only=False):

            start_alias=None, opts=None, as_pairs=False, from_parent=None):

        """

        Computes the default columns for selecting every field in the base

        model. Will sometimes be called to pull in related models (e.g. via
@@ -127,7 +127,7 @@ class GeoSQLCompiler(compiler.SQLCompiler): 
        if start_alias:

            seen = {None: start_alias}

        for field, model in opts.get_fields_with_model():

            if local_only and model is not None:

            if from_parent and model is not None and issubclass(from_parent, model):

                continue

            if start_alias:

                try: