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

Commit15c6764

Browse files
committed
Don't include "schema." in the set of possible tab completions once
"schema." has been typed. This allows readline to complete subsequentcharacters immediately if all relations in the target schema start withthe same prefix. This actually worked before, but I unintentionallybroke it a few days ago.Also, make completion schema-aware for GRANT, REVOKE, VACUUM.
1 parent979b537 commit15c6764

File tree

1 file changed

+20
-26
lines changed

1 file changed

+20
-26
lines changed

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

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.89 2003/10/17 11:52:06 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.90 2003/10/28 23:35:52 tgl Exp $
77
*/
88

99
/*----------------------------------------------------------------------
@@ -142,7 +142,7 @@ initialize_readline(void)
142142
" UNION" \
143143
" SELECT pg_catalog.quote_ident(nspname) || '.'" \
144144
" FROM pg_catalog.pg_namespace" \
145-
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d)='%s'" \
145+
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s'" \
146146
" UNION" \
147147
" SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(proname)" \
148148
" FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n" \
@@ -180,7 +180,7 @@ initialize_readline(void)
180180
" UNION "\
181181
" SELECT pg_catalog.quote_ident(nspname) || '.'"\
182182
" FROM pg_catalog.pg_namespace "\
183-
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d)='%s' "\
183+
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s' "\
184184
" UNION "\
185185
" SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.format_type(t.oid, NULL)"\
186186
" FROM pg_catalog.pg_type t, pg_catalog.pg_namespace n "\
@@ -204,7 +204,7 @@ initialize_readline(void)
204204
" UNION" \
205205
" SELECT pg_catalog.quote_ident(nspname) || '.'"\
206206
" FROM pg_catalog.pg_namespace "\
207-
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d)='%s' "\
207+
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s' "\
208208
" UNION "\
209209
" SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(typname)"\
210210
" FROM pg_catalog.pg_type t, pg_catalog.pg_namespace n "\
@@ -230,7 +230,7 @@ initialize_readline(void)
230230
" UNION "\
231231
" SELECT pg_catalog.quote_ident(nspname) || '.' "\
232232
" FROM pg_catalog.pg_namespace "\
233-
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d)='%s' "\
233+
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s' "\
234234
" UNION "\
235235
" SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(proname) "\
236236
" FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n "\
@@ -253,7 +253,7 @@ initialize_readline(void)
253253
" UNION "\
254254
" SELECT pg_catalog.quote_ident(nspname) || '.' "\
255255
" FROM pg_catalog.pg_namespace "\
256-
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d)='%s' "\
256+
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s' "\
257257
" UNION "\
258258
" SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(relname) "\
259259
" FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n "\
@@ -288,7 +288,7 @@ initialize_readline(void)
288288
" UNION "\
289289
" SELECT pg_catalog.quote_ident(nspname) || '.' "\
290290
" FROM pg_catalog.pg_namespace "\
291-
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d)='%s' "\
291+
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s' "\
292292
" UNION "\
293293
" SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(relname) "\
294294
" FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n "\
@@ -321,7 +321,7 @@ initialize_readline(void)
321321
" UNION "\
322322
" SELECT pg_catalog.quote_ident(nspname) || '.' "\
323323
" FROM pg_catalog.pg_namespace "\
324-
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d)='%s' "\
324+
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s' "\
325325
" UNION "\
326326
" SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(relname) "\
327327
" FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n "\
@@ -345,7 +345,7 @@ initialize_readline(void)
345345
" UNION "\
346346
" SELECT pg_catalog.quote_ident(nspname) || '.' "\
347347
" FROM pg_catalog.pg_namespace "\
348-
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d)='%s' "\
348+
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s' "\
349349
" UNION "\
350350
" SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(relname) "\
351351
" FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n "\
@@ -369,7 +369,7 @@ initialize_readline(void)
369369
" UNION "\
370370
" SELECT pg_catalog.quote_ident(nspname) || '.' "\
371371
" FROM pg_catalog.pg_namespace "\
372-
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d)='%s' "\
372+
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s' "\
373373
" UNION "\
374374
" SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(relname) "\
375375
" FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n "\
@@ -393,7 +393,7 @@ initialize_readline(void)
393393
" UNION "\
394394
" SELECT pg_catalog.quote_ident(nspname) || '.' "\
395395
" FROM pg_catalog.pg_namespace "\
396-
" WHERE substring(pg_catalog.quote_ident(nspname) || '.',1,%d)='%s' "\
396+
" WHERE substring(pg_catalog.quote_ident(nspname),1,%d)='%s' "\
397397
" UNION "\
398398
" SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(relname) "\
399399
" FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n "\
@@ -991,20 +991,11 @@ psql_completion(char *text, int start, int end)
991991
elseif ((strcasecmp(prev3_wd,"GRANT")==0||
992992
strcasecmp(prev3_wd,"REVOKE")==0)&&
993993
strcasecmp(prev_wd,"ON")==0)
994-
COMPLETE_WITH_QUERY("SELECT pg_catalog.quote_ident(relname) FROM pg_catalog.pg_class c, pg_catalog.pg_namespace n "
995-
" WHERE relkind in ('r','S','v') "
996-
" AND substring(pg_catalog.quote_ident(relname),1,%d)='%s' "
997-
" AND pg_catalog.pg_table_is_visible(c.oid) "
998-
" AND relnamespace = n.oid "
999-
" AND n.nspname NOT IN ('pg_catalog', 'pg_toast') "
1000-
" UNION "
1001-
"SELECT 'DATABASE' "
1002-
" UNION "
1003-
"SELECT 'FUNCTION' "
1004-
" UNION "
1005-
"SELECT 'LANGUAGE' "
1006-
" UNION "
1007-
"SELECT 'SCHEMA' ");
994+
COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tsv
995+
" UNION SELECT 'DATABASE'"
996+
" UNION SELECT 'FUNCTION'"
997+
" UNION SELECT 'LANGUAGE'"
998+
" UNION SELECT 'SCHEMA'");
1008999

10091000
/* Complete "GRANT/REVOKE * ON * " with "TO" */
10101001
elseif ((strcasecmp(prev4_wd,"GRANT")==0||
@@ -1251,7 +1242,10 @@ psql_completion(char *text, int start, int end)
12511242

12521243
/* VACUUM */
12531244
elseif (strcasecmp(prev_wd,"VACUUM")==0)
1254-
COMPLETE_WITH_QUERY("SELECT pg_catalog.quote_ident(relname) FROM pg_catalog.pg_class WHERE relkind='r' and substring(pg_catalog.quote_ident(relname),1,%d)='%s' and pg_catalog.pg_table_is_visible(oid) UNION SELECT 'FULL' UNION SELECT 'ANALYZE' UNION SELECT 'VERBOSE'");
1245+
COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables
1246+
" UNION SELECT 'FULL'"
1247+
" UNION SELECT 'ANALYZE'"
1248+
" UNION SELECT 'VERBOSE'");
12551249
elseif (strcasecmp(prev2_wd,"VACUUM")==0&&
12561250
(strcasecmp(prev_wd,"FULL")==0||
12571251
strcasecmp(prev_wd,"ANALYZE")==0||

0 commit comments

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