database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Final(?) GUC clean-up. Update psql tab completion.

Browse Source
This commit is contained in:
Peter Eisentraut
2000-12-03 14:36:47 +00:00
parent 65b362fae1
commit 13dbd0276a
3 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/utils/misc/guc.c
View File

@ -4,7 +4,7 @@
* Support for grand unified configuration scheme, including SET
* command, configuration file, and command line options.
*
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.25 2000/11/30 01:47:32 vadim Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.26 2000/12/03 14:36:46 petere Exp $
*
* Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>.
@ -207,8 +207,8 @@ ConfigureNamesBool[] =
{"debug_deadlocks", PGC_SUSET, &Debug_deadlocks, false},
#endif
{"hostlookup", PGC_SIGHUP, &HostnameLookup, false},
{"showportnumber", PGC_SIGHUP, &ShowPortNumber, false},
{"hostname_lookup", PGC_SIGHUP, &HostnameLookup, false},
{"show_source_port", PGC_SIGHUP, &ShowPortNumber, false},
{"sql_inheritance", PGC_USERSET, &SQL_inheritance, true},
@ -219,7 +219,7 @@ ConfigureNamesBool[] =
static struct config_int
ConfigureNamesInt[] =
{
{"geqo_rels", PGC_USERSET, &geqo_rels,
{"geqo_threshold", PGC_USERSET, &geqo_rels,
DEFAULT_GEQO_RELS, 2, INT_MAX},
{"geqo_pool_size", PGC_USERSET, &Geqo_pool_size,
DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE},

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

@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.22 2000/10/25 20:36:52 tgl Exp $
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.23 2000/12/03 14:36:47 petere Exp $
*/
/*----------------------------------------------------------------------
@ -201,6 +201,7 @@ psql_completion(char *text, int start, int end)
/* these SET arguments are known in gram.y */
"CONSTRAINTS",
"NAMES",
"SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL",
"TRANSACTION ISOLATION LEVEL",
/* these are treated in backend/commands/variable.c */
"DateStyle",
@ -208,9 +209,7 @@ psql_completion(char *text, int start, int end)
"client_encoding",
"server_encoding",
"random_seed",
/* the rest should match USERSET and SUSET entries in
* backend/utils/misc/guc.c, but feel free to leave out the
* esoteric or debug settings */
/* the rest should match USERSET entries in backend/utils/misc/guc.c */
"enable_seqscan",
"enable_indexscan",
"enable_tidscan",
@ -220,15 +219,36 @@ psql_completion(char *text, int start, int end)
"enable_hashjoin",
"geqo",
"ksqo",
"fsync",
"debug_assertions",
"debug_print_query",
"debug_print_parse",
"debug_print_rewritten",
"debug_print_plan",
"debug_pretty_print",
"show_parser_stats",
"show_planner_stats",
"show_executor_stats",
"show_query_stats",
"trace_notify",
"sql_inheritance",
"geqo_threshold",
"geqo_pool_size",
"geqo_effort",
"geqo_generations",
"geqo_random_seed",
"sort_mem",
"debug_level",
"max_expr_depth",
"commit_delay",
"effective_cache_size",
"random_page_cost",
"cpu_tuple_cost",
"cpu_index_tuple_cost",
"cpu_operator_cost",
"geqo_selection_bias",
NULL
};
@ -592,7 +612,7 @@ psql_completion(char *text, int start, int end)
strcasecmp(prev2_wd, "TRANSACTION") == 0 &&
strcasecmp(prev_wd, "ISOLATION") == 0)
COMPLETE_WITH_CONST("LEVEL");
else if (strcasecmp(prev4_wd, "SET") == 0 &&
else if ((strcasecmp(prev4_wd, "SET") == 0 || strcasecmp(prev4_wd, "AS") == 0) &&
strcasecmp(prev3_wd, "TRANSACTION") == 0 &&
strcasecmp(prev2_wd, "ISOLATION") == 0 &&
strcasecmp(prev_wd, "LEVEL") == 0)