aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/psql/tab-complete.in.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c
index 6a9c5e240fb..e9af7b37ac8 100644
--- a/src/bin/psql/tab-complete.in.c
+++ b/src/bin/psql/tab-complete.in.c
@@ -5167,6 +5167,18 @@ match_previous_words(int pattern_id,
/* ... JOIN ... */
else if (TailMatches("JOIN"))
COMPLETE_WITH_SCHEMA_QUERY_PLUS(Query_for_list_of_selectables, "LATERAL");
+ else if (TailMatches("JOIN", MatchAny) && !TailMatches("CROSS|NATURAL", "JOIN", MatchAny))
+ COMPLETE_WITH("ON", "USING (");
+ else if (TailMatches("JOIN", MatchAny, MatchAny) &&
+ !TailMatches("CROSS|NATURAL", "JOIN", MatchAny, MatchAny) && !TailMatches("ON|USING"))
+ COMPLETE_WITH("ON", "USING (");
+ else if (TailMatches("JOIN", "LATERAL", MatchAny, MatchAny) &&
+ !TailMatches("CROSS|NATURAL", "JOIN", "LATERAL", MatchAny, MatchAny) && !TailMatches("ON|USING"))
+ COMPLETE_WITH("ON", "USING (");
+ else if (TailMatches("JOIN", MatchAny, "USING") ||
+ TailMatches("JOIN", MatchAny, MatchAny, "USING") ||
+ TailMatches("JOIN", "LATERAL", MatchAny, MatchAny, "USING"))
+ COMPLETE_WITH("(");
/* ... AT [ LOCAL | TIME ZONE ] ... */
else if (TailMatches("AT"))