mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix function argument tab completion for schema-qualified or quoted function names

Browse Source 
Dean Rasheed, reviewed by Josh Kupershmidt
This commit is contained in:
Magnus Hagander 2012-07-05 14:03:49 +02:00
parent 539d38757a
commit 3644a63984
1 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/bin/psql/tab-complete.c
View File

@ -142,6 +142,7 @@ static bool completion_case_sensitive; /* completion is case sensitive */
* 3) The items from a null-pointer-terminated list. * 3) The items from a null-pointer-terminated list.
* 4) A string constant. * 4) A string constant.
* 5) The list of attributes of the given table (possibly schema-qualified). * 5) The list of attributes of the given table (possibly schema-qualified).
* 6/ The list of arguments to the given function (possibly schema-qualified).
*/ */
#define COMPLETE_WITH_QUERY(query) \ #define COMPLETE_WITH_QUERY(query) \
do { \ do { \
@ -202,6 +203,31 @@ do { \
matches = completion_matches(text, complete_from_query); \ matches = completion_matches(text, complete_from_query); \
} while (0) } while (0)
#define COMPLETE_WITH_FUNCTION_ARG(function) \
do { \
char *_completion_schema; \
char *_completion_function; \
\
_completion_schema = strtokx(function, " \t\n\r", ".", "\"", 0, \
false, false, pset.encoding); \
(void) strtokx(NULL, " \t\n\r", ".", "\"", 0, \
false, false, pset.encoding); \
_completion_function = strtokx(NULL, " \t\n\r", ".", "\"", 0, \
false, false, pset.encoding); \
if (_completion_function == NULL) \
{ \
completion_charp = Query_for_list_of_arguments; \
completion_info_charp = function; \
} \
else \
{ \
completion_charp = Query_for_list_of_arguments_with_schema; \
completion_info_charp = _completion_function; \
completion_info_charp2 = _completion_schema; \
} \
matches = completion_matches(text, complete_from_query); \
} while (0)
/* /*
* Assembly instructions for schema queries * Assembly instructions for schema queries
*/ */
@ -598,10 +624,25 @@ static const SchemaQuery Query_for_list_of_views = {
" FROM pg_catalog.pg_am "\ " FROM pg_catalog.pg_am "\
" WHERE substring(pg_catalog.quote_ident(amname),1,%d)='%s'" " WHERE substring(pg_catalog.quote_ident(amname),1,%d)='%s'"
/* the silly-looking length condition is just to eat up the current word */
#define Query_for_list_of_arguments \ #define Query_for_list_of_arguments \
" SELECT pg_catalog.oidvectortypes(proargtypes)||')' "\ "SELECT pg_catalog.oidvectortypes(proargtypes)||')' "\
" FROM pg_catalog.pg_proc "\ " FROM pg_catalog.pg_proc "\
" WHERE proname='%s'" " WHERE (%d = pg_catalog.length('%s'))"\
" AND (pg_catalog.quote_ident(proname)='%s'"\
" OR '\"' || proname || '\"'='%s') "\
" AND (pg_catalog.pg_function_is_visible(pg_proc.oid))"
/* the silly-looking length condition is just to eat up the current word */
#define Query_for_list_of_arguments_with_schema \
"SELECT pg_catalog.oidvectortypes(proargtypes)||')' "\
" FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n "\
" WHERE (%d = pg_catalog.length('%s'))"\
" AND n.oid = p.pronamespace "\
" AND (pg_catalog.quote_ident(proname)='%s' "\
" OR '\"' || proname || '\"' ='%s') "\
" AND (pg_catalog.quote_ident(nspname)='%s' "\
" OR '\"' || nspname || '\"' ='%s') "
#define Query_for_list_of_extensions \ #define Query_for_list_of_extensions \
" SELECT pg_catalog.quote_ident(extname) "\ " SELECT pg_catalog.quote_ident(extname) "\
@ -863,13 +904,7 @@ psql_completion(char *text, int start, int end)
COMPLETE_WITH_LIST(list_ALTERAGG); COMPLETE_WITH_LIST(list_ALTERAGG);
} }
else else
{ COMPLETE_WITH_FUNCTION_ARG(prev2_wd);
char *tmp_buf = malloc(strlen(Query_for_list_of_arguments) + strlen(prev2_wd));
sprintf(tmp_buf, Query_for_list_of_arguments, prev2_wd);
COMPLETE_WITH_QUERY(tmp_buf);
free(tmp_buf);
}
} }
/* ALTER SCHEMA <name> */ /* ALTER SCHEMA <name> */
@ -2186,13 +2221,7 @@ psql_completion(char *text, int start, int end)
(pg_strcasecmp(prev3_wd, "AGGREGATE") == 0 || (pg_strcasecmp(prev3_wd, "AGGREGATE") == 0 ||
pg_strcasecmp(prev3_wd, "FUNCTION") == 0) && pg_strcasecmp(prev3_wd, "FUNCTION") == 0) &&
pg_strcasecmp(prev_wd, "(") == 0) pg_strcasecmp(prev_wd, "(") == 0)
{ COMPLETE_WITH_FUNCTION_ARG(prev2_wd);
char *tmp_buf = malloc(strlen(Query_for_list_of_arguments) + strlen(prev2_wd));
sprintf(tmp_buf, Query_for_list_of_arguments, prev2_wd);
COMPLETE_WITH_QUERY(tmp_buf);
free(tmp_buf);
}
/* DROP OWNED BY */ /* DROP OWNED BY */
else if (pg_strcasecmp(prev2_wd, "DROP") == 0 && else if (pg_strcasecmp(prev2_wd, "DROP") == 0 &&
pg_strcasecmp(prev_wd, "OWNED") == 0) pg_strcasecmp(prev_wd, "OWNED") == 0)