Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite8d118f

Browse files
committed
Fix bogus tab-completion rule for CREATE PUBLICATION.
You can't use "FOR TABLE" as a single Matches argument, because readlinewill consider that input to be two words not one. It's necessary to makethe pattern contain two arguments.The case accidentally worked anyway because the words_after_createtest fired ... but only for the first such table name.Noted by Edmund Horner, though this isn't exactly his proposed fix.Backpatch to v10 where the faulty code came in.Discussion:https://postgr.es/m/CAMyN-kDe=gBmHgxWwUUaXuwK+p+7g1vChR7foPHRDLE592nJPQ@mail.gmail.com
1 parent917fe6a commite8d118f

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

‎src/bin/psql/tab-complete.c

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,6 +1405,21 @@ psql_completion(const char *text, int start, int end)
14051405
word_matches(p2, previous_words[previous_words_count - 2]) && \
14061406
word_matches(p3, previous_words[previous_words_count - 3]))
14071407

1408+
#defineHeadMatches4(p1,p2,p3,p4) \
1409+
(previous_words_count >= 4 && \
1410+
word_matches(p1, previous_words[previous_words_count - 1]) && \
1411+
word_matches(p2, previous_words[previous_words_count - 2]) && \
1412+
word_matches(p3, previous_words[previous_words_count - 3]) && \
1413+
word_matches(p4, previous_words[previous_words_count - 4]))
1414+
1415+
#defineHeadMatches5(p1,p2,p3,p4,p5) \
1416+
(previous_words_count >= 5 && \
1417+
word_matches(p1, previous_words[previous_words_count - 1]) && \
1418+
word_matches(p2, previous_words[previous_words_count - 2]) && \
1419+
word_matches(p3, previous_words[previous_words_count - 3]) && \
1420+
word_matches(p4, previous_words[previous_words_count - 4]) && \
1421+
word_matches(p5, previous_words[previous_words_count - 5]))
1422+
14081423
/* Known command-starting keywords. */
14091424
staticconstchar*constsql_commands[]= {
14101425
"ABORT","ALTER","ANALYZE","BEGIN","CHECKPOINT","CLOSE","CLUSTER",
@@ -2424,8 +2439,8 @@ psql_completion(const char *text, int start, int end)
24242439
COMPLETE_WITH_LIST3("FOR TABLE","FOR ALL TABLES","WITH (");
24252440
elseif (Matches4("CREATE","PUBLICATION",MatchAny,"FOR"))
24262441
COMPLETE_WITH_LIST2("TABLE","ALL TABLES");
2427-
/* Complete "CREATE PUBLICATION <name> FOR TABLE <table>" */
2428-
elseif (Matches4("CREATE","PUBLICATION",MatchAny,"FORTABLE"))
2442+
/* Complete "CREATE PUBLICATION <name> FOR TABLE <table>, ..." */
2443+
elseif (HeadMatches5("CREATE","PUBLICATION",MatchAny,"FOR","TABLE"))
24292444
COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables,NULL);
24302445
/* Complete "CREATE PUBLICATION <name> [...] WITH" */
24312446
elseif (HeadMatches2("CREATE","PUBLICATION")&&TailMatches2("WITH","("))

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp