diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index b4375e8dfe..8d003542ae 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -8,7 +8,7 @@ * Darko Prenosil * Shridhar Daithankar * - * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.82.2.6 2010/06/14 20:49:39 tgl Exp $ + * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.82.2.7 2010/06/15 16:22:26 tgl Exp $ * Copyright (c) 2001-2009, PostgreSQL Global Development Group * ALL RIGHTS RESERVED; * @@ -87,13 +87,13 @@ static void createNewConnection(const char *name, remoteConn *rconn); static void deleteConnection(const char *name); static char **get_pkey_attnames(Relation rel, int16 *numatts); static char **get_text_array_contents(ArrayType *array, int *numitems); -static char *get_sql_insert(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals); -static char *get_sql_delete(Relation rel, int2vector *pkattnums, int16 pknumatts, char **tgt_pkattvals); -static char *get_sql_update(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals); +static char *get_sql_insert(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals, char **tgt_pkattvals); +static char *get_sql_delete(Relation rel, int *pkattnums, int pknumatts, char **tgt_pkattvals); +static char *get_sql_update(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals, char **tgt_pkattvals); static char *quote_literal_cstr(char *rawstr); static char *quote_ident_cstr(char *rawstr); -static int16 get_attnum_pk_pos(int2vector *pkattnums, int16 pknumatts, int16 key); -static HeapTuple get_tuple_of_interest(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals); +static int get_attnum_pk_pos(int *pkattnums, int pknumatts, int key); +static HeapTuple get_tuple_of_interest(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals); static Relation get_rel_from_relname(text *relname_text, LOCKMODE lockmode, AclMode aclmode); static char *generate_relation_name(Relation rel); static void dblink_connstr_check(const char *connstr); @@ -101,7 +101,9 @@ static void dblink_security_check(PGconn *conn, remoteConn *rconn); static void dblink_res_error(const char *conname, PGresult *res, const char *dblink_context_msg, bool fail); static char *get_connect_string(const char *servername); static char *escape_param_str(const char *from); -static int get_nondropped_natts(Relation rel); +static void validate_pkattnums(Relation rel, + int2vector *pkattnums_arg, int32 pknumatts_arg, + int **pkattnums, int *pknumatts); /* Global */ static remoteConn *pconn = NULL; @@ -1355,18 +1357,18 @@ Datum dblink_build_sql_insert(PG_FUNCTION_ARGS) { text *relname_text = PG_GETARG_TEXT_P(0); - int2vector *pkattnums = (int2vector *) PG_GETARG_POINTER(1); - int32 pknumatts_tmp = PG_GETARG_INT32(2); + int2vector *pkattnums_arg = (int2vector *) PG_GETARG_POINTER(1); + int32 pknumatts_arg = PG_GETARG_INT32(2); ArrayType *src_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3); ArrayType *tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(4); Relation rel; - int16 pknumatts = 0; + int *pkattnums; + int pknumatts; char **src_pkattvals; char **tgt_pkattvals; int src_nitems; int tgt_nitems; char *sql; - int nondropped_natts; /* * Open target relation. @@ -1374,29 +1376,10 @@ dblink_build_sql_insert(PG_FUNCTION_ARGS) rel = get_rel_from_relname(relname_text, AccessShareLock, ACL_SELECT); /* - * There should be at least one key attribute + * Process pkattnums argument. */ - if (pknumatts_tmp <= 0) - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("number of key attributes must be > 0"))); - - if (pknumatts_tmp <= SHRT_MAX) - pknumatts = pknumatts_tmp; - else - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("input for number of primary key " \ - "attributes too large"))); - - /* - * ensure we don't ask for more pk attributes than we have - * non-dropped columns - */ - nondropped_natts = get_nondropped_natts(rel); - if (pknumatts > nondropped_natts) - ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("number of primary key fields exceeds number of specified relation attributes"))); + validate_pkattnums(rel, pkattnums_arg, pknumatts_arg, + &pkattnums, &pknumatts); /* * Source array is made up of key values that will be used to locate the @@ -1465,12 +1448,12 @@ Datum dblink_build_sql_delete(PG_FUNCTION_ARGS) { text *relname_text = PG_GETARG_TEXT_P(0); - int2vector *pkattnums = (int2vector *) PG_GETARG_POINTER(1); - int32 pknumatts_tmp = PG_GETARG_INT32(2); + int2vector *pkattnums_arg = (int2vector *) PG_GETARG_POINTER(1); + int32 pknumatts_arg = PG_GETARG_INT32(2); ArrayType *tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3); - int nondropped_natts; Relation rel; - int16 pknumatts = 0; + int *pkattnums; + int pknumatts; char **tgt_pkattvals; int tgt_nitems; char *sql; @@ -1481,29 +1464,10 @@ dblink_build_sql_delete(PG_FUNCTION_ARGS) rel = get_rel_from_relname(relname_text, AccessShareLock, ACL_SELECT); /* - * There should be at least one key attribute + * Process pkattnums argument. */ - if (pknumatts_tmp <= 0) - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("number of key attributes must be > 0"))); - - if (pknumatts_tmp <= SHRT_MAX) - pknumatts = pknumatts_tmp; - else - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("input for number of primary key " \ - "attributes too large"))); - - /* - * ensure we don't ask for more pk attributes than we have - * non-dropped columns - */ - nondropped_natts = get_nondropped_natts(rel); - if (pknumatts > nondropped_natts) - ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("number of primary key fields exceeds number of specified relation attributes"))); + validate_pkattnums(rel, pkattnums_arg, pknumatts_arg, + &pkattnums, &pknumatts); /* * Target array is made up of key values that will be used to build the @@ -1561,13 +1525,13 @@ Datum dblink_build_sql_update(PG_FUNCTION_ARGS) { text *relname_text = PG_GETARG_TEXT_P(0); - int2vector *pkattnums = (int2vector *) PG_GETARG_POINTER(1); - int32 pknumatts_tmp = PG_GETARG_INT32(2); + int2vector *pkattnums_arg = (int2vector *) PG_GETARG_POINTER(1); + int32 pknumatts_arg = PG_GETARG_INT32(2); ArrayType *src_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(3); ArrayType *tgt_pkattvals_arry = PG_GETARG_ARRAYTYPE_P(4); - int nondropped_natts; Relation rel; - int16 pknumatts = 0; + int *pkattnums; + int pknumatts; char **src_pkattvals; char **tgt_pkattvals; int src_nitems; @@ -1580,29 +1544,10 @@ dblink_build_sql_update(PG_FUNCTION_ARGS) rel = get_rel_from_relname(relname_text, AccessShareLock, ACL_SELECT); /* - * There should be one source array key values for each key attnum + * Process pkattnums argument. */ - if (pknumatts_tmp <= 0) - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("number of key attributes must be > 0"))); - - if (pknumatts_tmp <= SHRT_MAX) - pknumatts = pknumatts_tmp; - else - ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("input for number of primary key " \ - "attributes too large"))); - - /* - * ensure we don't ask for more pk attributes than we have - * non-dropped columns - */ - nondropped_natts = get_nondropped_natts(rel); - if (pknumatts > nondropped_natts) - ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("number of primary key fields exceeds number of specified relation attributes"))); + validate_pkattnums(rel, pkattnums_arg, pknumatts_arg, + &pkattnums, &pknumatts); /* * Source array is made up of key values that will be used to locate the @@ -1787,7 +1732,7 @@ get_text_array_contents(ArrayType *array, int *numitems) } static char * -get_sql_insert(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals) +get_sql_insert(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals, char **tgt_pkattvals) { char *relname; HeapTuple tuple; @@ -1795,7 +1740,7 @@ get_sql_insert(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_ int natts; StringInfoData buf; char *val; - int16 key; + int key; int i; bool needComma; @@ -1844,7 +1789,7 @@ get_sql_insert(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_ appendStringInfo(&buf, ","); if (tgt_pkattvals != NULL) - key = get_attnum_pk_pos(pkattnums, pknumatts, i + 1); + key = get_attnum_pk_pos(pkattnums, pknumatts, i); else key = -1; @@ -1868,11 +1813,10 @@ get_sql_insert(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_ } static char * -get_sql_delete(Relation rel, int2vector *pkattnums, int16 pknumatts, char **tgt_pkattvals) +get_sql_delete(Relation rel, int *pkattnums, int pknumatts, char **tgt_pkattvals) { char *relname; TupleDesc tupdesc; - int natts; StringInfoData buf; int i; @@ -1882,18 +1826,17 @@ get_sql_delete(Relation rel, int2vector *pkattnums, int16 pknumatts, char **tgt_ relname = generate_relation_name(rel); tupdesc = rel->rd_att; - natts = tupdesc->natts; appendStringInfo(&buf, "DELETE FROM %s WHERE ", relname); for (i = 0; i < pknumatts; i++) { - int16 pkattnum = pkattnums->values[i]; + int pkattnum = pkattnums[i]; if (i > 0) appendStringInfo(&buf, " AND "); appendStringInfoString(&buf, - quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname))); + quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname))); if (tgt_pkattvals == NULL) /* internal error */ @@ -1910,7 +1853,7 @@ get_sql_delete(Relation rel, int2vector *pkattnums, int16 pknumatts, char **tgt_ } static char * -get_sql_update(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals, char **tgt_pkattvals) +get_sql_update(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals, char **tgt_pkattvals) { char *relname; HeapTuple tuple; @@ -1918,7 +1861,7 @@ get_sql_update(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_ int natts; StringInfoData buf; char *val; - int16 key; + int key; int i; bool needComma; @@ -1951,7 +1894,7 @@ get_sql_update(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_ quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname))); if (tgt_pkattvals != NULL) - key = get_attnum_pk_pos(pkattnums, pknumatts, i + 1); + key = get_attnum_pk_pos(pkattnums, pknumatts, i); else key = -1; @@ -1974,18 +1917,18 @@ get_sql_update(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_ for (i = 0; i < pknumatts; i++) { - int16 pkattnum = pkattnums->values[i]; + int pkattnum = pkattnums[i]; if (i > 0) appendStringInfo(&buf, " AND "); appendStringInfo(&buf, "%s", - quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname))); + quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname))); if (tgt_pkattvals != NULL) val = tgt_pkattvals[i] ? pstrdup(tgt_pkattvals[i]) : NULL; else - val = SPI_getvalue(tuple, tupdesc, pkattnum); + val = SPI_getvalue(tuple, tupdesc, pkattnum + 1); if (val != NULL) { @@ -2037,8 +1980,8 @@ quote_ident_cstr(char *rawstr) return result; } -static int16 -get_attnum_pk_pos(int2vector *pkattnums, int16 pknumatts, int16 key) +static int +get_attnum_pk_pos(int *pkattnums, int pknumatts, int key) { int i; @@ -2046,14 +1989,14 @@ get_attnum_pk_pos(int2vector *pkattnums, int16 pknumatts, int16 key) * Not likely a long list anyway, so just scan for the value */ for (i = 0; i < pknumatts; i++) - if (key == pkattnums->values[i]) + if (key == pkattnums[i]) return i; return -1; } static HeapTuple -get_tuple_of_interest(Relation rel, int2vector *pkattnums, int16 pknumatts, char **src_pkattvals) +get_tuple_of_interest(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals) { char *relname; TupleDesc tupdesc; @@ -2084,13 +2027,13 @@ get_tuple_of_interest(Relation rel, int2vector *pkattnums, int16 pknumatts, char for (i = 0; i < pknumatts; i++) { - int16 pkattnum = pkattnums->values[i]; + int pkattnum = pkattnums[i]; if (i > 0) appendStringInfo(&buf, " AND "); appendStringInfoString(&buf, - quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum - 1]->attname))); + quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname))); if (src_pkattvals[i] != NULL) appendStringInfo(&buf, " = %s", @@ -2464,24 +2407,52 @@ escape_param_str(const char *str) return buf->data; } -static int -get_nondropped_natts(Relation rel) +/* + * Validate the PK-attnums argument for dblink_build_sql_insert() and related + * functions, and translate to the internal representation. + * + * The user supplies an int2vector of 1-based physical attnums, plus a count + * argument (the need for the separate count argument is historical, but we + * still check it). We check that each attnum corresponds to a valid, + * non-dropped attribute of the rel. We do *not* prevent attnums from being + * listed twice, though the actual use-case for such things is dubious. + * + * The internal representation is a palloc'd int array of 0-based physical + * attnums. + */ +static void +validate_pkattnums(Relation rel, + int2vector *pkattnums_arg, int32 pknumatts_arg, + int **pkattnums, int *pknumatts) { - int nondropped_natts = 0; - TupleDesc tupdesc; - int natts; + TupleDesc tupdesc = rel->rd_att; + int natts = tupdesc->natts; int i; - tupdesc = rel->rd_att; - natts = tupdesc->natts; + /* Don't take more array elements than there are */ + pknumatts_arg = Min(pknumatts_arg, pkattnums_arg->dim1); - for (i = 0; i < natts; i++) + /* Must have at least one pk attnum selected */ + if (pknumatts_arg <= 0) + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("number of key attributes must be > 0"))); + + /* Allocate output array */ + *pkattnums = (int *) palloc(pknumatts_arg * sizeof(int)); + *pknumatts = pknumatts_arg; + + /* Validate attnums and convert to internal form */ + for (i = 0; i < pknumatts_arg; i++) { - if (tupdesc->attrs[i]->attisdropped) - continue; - nondropped_natts++; - } + int pkattnum = pkattnums_arg->values[i]; - return nondropped_natts; + if (pkattnum <= 0 || pkattnum > natts || + tupdesc->attrs[pkattnum - 1]->attisdropped) + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("invalid attribute number %d", pkattnum))); + (*pkattnums)[i] = pkattnum - 1; + } } diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index b92819620f..cc5c028460 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -41,7 +41,7 @@ SELECT dblink_build_sql_insert('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}'); -- too many pk fields, should fail SELECT dblink_build_sql_insert('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}','{"99", "xyz", "{za0,zb0,zc0}"}'); -ERROR: number of primary key fields exceeds number of specified relation attributes +ERROR: invalid attribute number 4 -- build an update statement based on a local tuple, -- replacing the primary key values with new ones SELECT dblink_build_sql_update('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}'); @@ -52,7 +52,7 @@ SELECT dblink_build_sql_update('foo','1 2',2,'{"0", "a"}','{"99", "xyz"}'); -- too many pk fields, should fail SELECT dblink_build_sql_update('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}','{"99", "xyz", "{za0,zb0,zc0}"}'); -ERROR: number of primary key fields exceeds number of specified relation attributes +ERROR: invalid attribute number 4 -- build a delete statement based on a local tuple, SELECT dblink_build_sql_delete('foo','1 2',2,'{"0", "a"}'); dblink_build_sql_delete @@ -62,7 +62,7 @@ SELECT dblink_build_sql_delete('foo','1 2',2,'{"0", "a"}'); -- too many pk fields, should fail SELECT dblink_build_sql_delete('foo','1 2 3 4',4,'{"0", "a", "{a0,b0,c0}"}'); -ERROR: number of primary key fields exceeds number of specified relation attributes +ERROR: invalid attribute number 4 -- retest using a quoted and schema qualified table CREATE SCHEMA "MySchema"; CREATE TABLE "MySchema"."Foo"(f1 int, f2 text, f3 text[], primary key (f1,f2));