Переглянути джерело

HUE-3181 [desktop] Avoid distinct query which fails on Oracle objects with CLOB (text) fields

Jenny Kim 9 роки тому
батько
коміт
93c9d2a

+ 2 - 2
desktop/core/src/desktop/api.py

@@ -37,8 +37,8 @@ LOG = logging.getLogger(__name__)
 def _get_docs(user):
   history_tag = DocumentTag.objects.get_history_tag(user)
 
-  dir_ids = [directory.doc.get().id for directory in Directory.objects.filter(doc__isnull=False).distinct()]
-  editor_ids = [document.doc.get().id for document in Document2.objects.filter(type__startswith='query').distinct()]
+  dir_ids = [directory.doc.get().id for directory in Directory.objects.filter(doc__isnull=False)]
+  editor_ids = [document.doc.get().id for document in Document2.objects.filter(type__startswith='query')]
 
   query = Document.objects.get_docs(user) \
       .exclude(tags__in=[history_tag]) \

+ 1 - 1
desktop/core/src/desktop/models.py

@@ -782,7 +782,7 @@ class Document2Manager(models.Manager):
     if not include_history:
       docs = docs.exclude(is_history=True)
 
-    return docs.distinct().order_by('-last_modified')
+    return docs.defer('description', 'data', 'extra').distinct().order_by('-last_modified')
 
   def refine_documents(self, documents, types=None, search_text=None, order_by=None):
     """