Ticket #13934: gis-local_only.patch

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

@@ -95 +95 @@
         return result
 
     def get_default_columns(self, with_aliases=False, col_aliases=None,
-                            start_alias=None, opts=None, as_pairs=False):
+                            start_alias=None, opts=None, as_pairs=False,
+                            local_only=False):
         """
         Computes the default columns for selecting every field in the base
         model. Will sometimes be called to pull in related models (e.g. via
@@ -113 +114 @@
         result = []
         if opts is None:
             opts = self.query.model._meta
+        qn = self.quote_name_unless_alias
+        qn2 = self.connection.ops.quote_name
         aliases = set()
         only_load = self.deferred_to_columns()
         # Skip all proxy to the root proxied model
@@ -121 +124 @@
         if start_alias:
             seen = {None: start_alias}
         for field, model in opts.get_fields_with_model():
+            if local_only and model is not None:
+                continue
             if start_alias:
                 try:
                     alias = seen[model]