Hello 2010/10/4 Itagaki Takahiro <itagaki.takah...@gmail.com>: > On Mon, Aug 16, 2010 at 8:32 PM, Pavel Stehule <pavel.steh...@gmail.com> > wrote: >> fixed spelling >> >> 2010/8/16 Pavel Stehule <pavel.steh...@gmail.com>: >>> I found so there are not support for tabcomple of psql variables. > > Contents & Purpose > ================== > This small patch adds support for tab-completion of \set meta command in psql. > Variables that can be set with \set include not only user-defined ones but > also > many pre-defined ones. So, the patch is useful to remember variable names. > > Initial Run > =========== > The patch can be applied to git master with one hunk, but it's not a problem. > Hunk #1 succeeded at 2582 (offset 65 lines). > > It can be compiled with no warnings, but it might be better to add an explicit > cast for the void * returned from realloc() (if we continue to use it; > see below).
fixed > > Performance > =========== > Since we don't have so many variables at once in normal use, the tab > completion > won't be a performance critical part. > > Bugs, suggestions, etc. > ======================= > BUG: If we have just 100 variables, there is a buffer overrun for the last > NULL sentinel. fixed > > realloc() is used in the patch, but it is rarely used in the existing codes. > It is used in converting a single-linked list into an array, but we could > remove it if we use two loops (for length and for copying). Or, we will > still use realloc, a wrapper for pg_realloc() might be better than using > realloc() directly to avoid "out of memory" checks for each callee. > > We don't have commands for display a list of such variables and \echo is > not tab-completed even with the patch. "Only supported by \set" might be > a bit unbalanced. > it's good idea. I looked on it - and it is job for other patch. Some test are in experimental patch. But this needs more work - output is little bit ugly - I thing so prefix and suffix should not be showed. So psql autocomplete should to work with some prefixes and suffixes and this needs a significant changes - so it isn't possible in this moment - just point for ToDo. Thank you very much for review. Regards Pavel Stehule > -- > Itagaki Takahiro >
*** ./src/bin/psql/tab-complete.c.orig 2010-08-14 15:59:49.000000000 +0200 --- ./src/bin/psql/tab-complete.c 2010-10-04 10:51:31.401032421 +0200 *************** *** 2447,2453 **** pg_strcasecmp(prev3_wd, "\\copy") != 0) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tsv, NULL); - /* Backslash commands */ /* TODO: \dc \dd \dl */ else if (strcmp(prev_wd, "\\connect") == 0 || strcmp(prev_wd, "\\c") == 0) --- 2447,2452 ---- *************** *** 2517,2522 **** --- 2516,2550 ---- COMPLETE_WITH_LIST(my_list); } + else if (strcmp(prev_wd, "\\set") == 0) + { + const char **varnames; + int nvars = 0; + int size = 100; + struct _variable *ptr; + + varnames = (const char **) pg_malloc((size + 1) * sizeof(char *)); + + /* fill array of varnames */ + for (ptr = pset.vars->next; ptr; ptr = ptr->next) + { + if (nvars == size) + { + size = size + 100; + varnames = (const char **) realloc(varnames, (size + 1) * sizeof(char *)); + if (!varnames) + { + psql_error("out of memory\n"); + exit(EXIT_FAILURE); + } + } + varnames[nvars++] = ptr->name; + } + varnames[nvars] = NULL; + COMPLETE_WITH_LIST(varnames); + + free(varnames); + } else if (strcmp(prev_wd, "\\sf") == 0 || strcmp(prev_wd, "\\sf+") == 0) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_functions, NULL); else if (strcmp(prev_wd, "\\cd") == 0 ||
*** ./src/bin/psql/tab-complete.c.orig 2010-08-14 15:59:49.000000000 +0200 --- ./src/bin/psql/tab-complete.c 2010-10-04 11:31:25.834909194 +0200 *************** *** 2447,2453 **** pg_strcasecmp(prev3_wd, "\\copy") != 0) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tsv, NULL); - /* Backslash commands */ /* TODO: \dc \dd \dl */ else if (strcmp(prev_wd, "\\connect") == 0 || strcmp(prev_wd, "\\c") == 0) --- 2447,2452 ---- *************** *** 2517,2522 **** --- 2516,2606 ---- COMPLETE_WITH_LIST(my_list); } + else if (strcmp(prev_wd, "\\set") == 0) + { + const char **varnames; + int nvars = 0; + int size = 100; + struct _variable *ptr; + + varnames = (const char **) pg_malloc((size + 1) * sizeof(char *)); + + /* fill array of varnames */ + for (ptr = pset.vars->next; ptr; ptr = ptr->next) + { + if (nvars == size) + { + size = size + 100; + varnames = (const char **) realloc(varnames, (size + 1) * sizeof(char *)); + if (!varnames) + { + psql_error("out of memory\n"); + exit(EXIT_FAILURE); + } + } + varnames[nvars++] = ptr->name; + } + varnames[nvars] = NULL; + COMPLETE_WITH_LIST(varnames); + + free(varnames); + } + else if (strncmp(text,"::", 2) != 0 && strncmp(text, ":", 1) == 0) + { + const char **varnames; + int nvars = 0; + int size = 100; + struct _variable *ptr; + const char *prefix; + const char *sufix; + char *buffer; + + if (strncmp(text, ":'", 2) == 0) + { + prefix = ":'"; + sufix = "'"; + } + else if (strncmp(text, ":\"", 2) == 0) + { + prefix = ":\""; + sufix = "\""; + } + else + { + prefix = ":"; + sufix = ""; + } + + varnames = (const char **) pg_malloc((size + 1) * sizeof(char *)); + + /* fill array of varnames */ + for (ptr = pset.vars->next; ptr; ptr = ptr->next) + { + int n; + + if (nvars == size) + { + size = size + 100; + varnames = (const char **) realloc(varnames, (size + 1) * sizeof(char *)); + if (!varnames) + { + psql_error("out of memory\n"); + exit(EXIT_FAILURE); + } + } + + /* alloc enought for name, prefix, and suffix */ + n = strlen(ptr->name) + 2 + 1 + 1; + buffer = (char *) pg_malloc(n); + snprintf(buffer, n, "%s%s%s", prefix, ptr->name, sufix); + varnames[nvars++] = buffer; + + } + varnames[nvars] = NULL; + COMPLETE_WITH_LIST(varnames); + + free(varnames); + } else if (strcmp(prev_wd, "\\sf") == 0 || strcmp(prev_wd, "\\sf+") == 0) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_functions, NULL); else if (strcmp(prev_wd, "\\cd") == 0 ||
-- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers