database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-12 21:01:52 +03:00
Code Activity

A couple further reloptions improvements, per KaiGai Kohei: add a validation

Browse Source 
function to the string type and add a couple of macros for string handling.

In passing, fix an off-by-one bug of mine.
This commit is contained in:
Alvaro Herrera
2009-01-08 19:34:41 +00:00
parent eb0d7e243a
commit b813c8daca
2 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/backend/access/common/reloptions.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.16 2009/01/06 14:47:37 alvherre Exp $
* $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.17 2009/01/08 19:34:41 alvherre Exp $
*
*-------------------------------------------------------------------------
*/
@ -336,9 +336,15 @@ add_real_reloption(int kind, char *name, char *desc, double default_val,
/*
* add_string_reloption
* Add a new string reloption
*
* "validator" is an optional function pointer that can be used to test the
* validity of the values. It must elog(ERROR) when the argument string is
* not acceptable for the variable. Note that the default value must pass
* the validation.
*/
void
add_string_reloption(int kind, char *name, char *desc, char *default_val)
add_string_reloption(int kind, char *name, char *desc, char *default_val,
validate_string_relopt validator)
{
MemoryContext oldcxt;
relopt_string *newoption;
@ -359,6 +365,7 @@ add_string_reloption(int kind, char *name, char *desc, char *default_val)
newoption->gen.kind = kind;
newoption->gen.namelen = strlen(name);
newoption->gen.type = RELOPT_TYPE_STRING;
newoption->validate_cb = validator;
if (default_val)
{
strcpy(newoption->default_val, default_val);
@ -372,6 +379,10 @@ add_string_reloption(int kind, char *name, char *desc, char *default_val)
newoption->default_isnull = true;
}
/* make sure the validator/default combination is sane */
if (newoption->validate_cb)
(newoption->validate_cb) (newoption->default_val, true);
MemoryContextSwitchTo(oldcxt);
add_reloption((relopt_gen *) newoption);
@ -729,10 +740,15 @@ parse_one_reloption(relopt_value *option, char *text_str, int text_len,
}
break;
case RELOPT_TYPE_STRING:
option->values.string_val = value;
nofree = true;
parsed = true;
/* no validation possible */
{
relopt_string *optstring = (relopt_string *) option->gen;
option->values.string_val = value;
nofree = true;
if (optstring->validate_cb)
(optstring->validate_cb) (value, validate);
parsed = true;
}
break;
default:
elog(ERROR, "unsupported reloption type %d", option->gen->type);