From 3f6d74e426b58abe0a930202bd5c3711e34789f2 Mon Sep 17 00:00:00 2001
From: serge-rider <serge.rider@gmail.com>
Date: Thu, 10 Mar 2016 15:39:40 +0300
Subject: [PATCH] Completion processor fix

---
 .../sql/syntax/SQLCompletionProcessor.java    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java
index b9851369a9..28b918d280 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLCompletionProcessor.java
@@ -364,17 +364,23 @@ public class SQLCompletionProcessor implements IContentAssistProcessor
             // Get matched children
             makeProposalsFromChildren(monitor, childObject, lastToken, proposals);
             if (proposals.isEmpty() || tokens.size() == 1) {
-                // At last - try to find child tables by pattern
-                DBSStructureAssistant structureAssistant = null;
-                for (DBSObject object = childObject; object != null; object =  object.getParentObject()) {
-                    structureAssistant = DBUtils.getAdapter(DBSStructureAssistant.class, object);
+                if (selectedContainer != null && selectedContainer != childObject) {
+                    // Try in active object
+                    makeProposalsFromChildren(monitor, selectedContainer, lastToken, proposals);
+                }
+                if (proposals.isEmpty()) {
+                    // At last - try to find child tables by pattern
+                    DBSStructureAssistant structureAssistant = null;
+                    for (DBSObject object = childObject; object != null; object =  object.getParentObject()) {
+                        structureAssistant = DBUtils.getAdapter(DBSStructureAssistant.class, object);
+                        if (structureAssistant != null) {
+                            break;
+                        }
+                    }
                     if (structureAssistant != null) {
-                        break;
+                        makeProposalsFromAssistant(monitor, structureAssistant, sc, lastToken, proposals);
                     }
                 }
-                if (structureAssistant != null) {
-                    makeProposalsFromAssistant(monitor, structureAssistant, sc, lastToken, proposals);
-                }
             }
         }
     }
-- 
GitLab