          if opts is None:
              opts = self.model._meta
          aliases = set()
          only_load = self.deferred_to_columns()
          proxied_model = opts.proxy and opts.proxy_for_model or 0
          if start_alias:
              seen = {None: start_alias}
          for field, model in opts.get_fields_with_model():
              if start_alias:
                  try:
 
</s> remove     def test12_count(self):
        "Testing `Count` aggregate use with the `GeoManager`. See #11087."
 </s> add     # TODO: fix on Oracle -- get the following error because the SQL is ordered
    # by a geometry object, which Oracle apparently doesn't like:
    #  ORA-22901: cannot compare nested table or VARRAY or LOB attributes of an object type
    @no_oracle
    def test12a_count(self):
        "Testing `Count` aggregate use with the `GeoManager` on geo-fields."
        # Skip all proxy to the root proxied model
        proxied_model = get_proxied_model(opts)

          if opts is None:
              opts = self.model._meta
          aliases = set()
          only_load = self.deferred_to_columns()
        # Skip all proxy to the root proxied model
        proxied_model = get_proxied_model(opts)

          if start_alias:
              seen = {None: start_alias}
          for field, model in opts.get_fields_with_model():
              if start_alias:
                  try:
keep keep keep keep replace keep keep keep keep keep
 Fixed #11489 -- `GeoQuery.resolve_columns` now recognizes annotations; disabled problematic test cases on Oracle and added notes on why.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11251 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/contrib/gis/db/models/sql/query.py