summaryrefslogtreecommitdiff
path: root/contrib/pgcrypto
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2022-07-01 10:51:45 +0200
committerPeter Eisentraut <peter@eisentraut.org>2022-07-01 11:23:15 +0200
commitd746021de18baf0f29eff0388204a0664f41eb8b (patch)
tree21074e7935e62cd054e702d79e5c1fe7c8544733 /contrib/pgcrypto
parent7c2d6f8d3400edab2b91de7765db9ec71235fac9 (diff)
downloadpostgresql-d746021de18baf0f29eff0388204a0664f41eb8b.tar.gz
Add construct_array_builtin, deconstruct_array_builtin
There were many calls to construct_array() and deconstruct_array() for built-in types, for example, when dealing with system catalog columns. These all hardcoded the type attributes necessary to pass to these functions. To simplify this a bit, add construct_array_builtin(), deconstruct_array_builtin() as wrappers that centralize this hardcoded knowledge. This simplifies many call sites and reduces the amount of hardcoded stuff that is spread around. Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://www.postgresql.org/message-id/flat/2914356f-9e5f-8c59-2995-5997fc48bcba%40enterprisedb.com
Diffstat (limited to 'contrib/pgcrypto')
-rw-r--r--contrib/pgcrypto/pgp-pgsql.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c
index 0536bfb892..d9b15b07b0 100644
--- a/contrib/pgcrypto/pgp-pgsql.c
+++ b/contrib/pgcrypto/pgp-pgsql.c
@@ -774,13 +774,8 @@ parse_key_value_arrays(ArrayType *key_array, ArrayType *val_array,
if (nkdims == 0)
return 0;
- deconstruct_array(key_array,
- TEXTOID, -1, false, TYPALIGN_INT,
- &key_datums, &key_nulls, &key_count);
-
- deconstruct_array(val_array,
- TEXTOID, -1, false, TYPALIGN_INT,
- &val_datums, &val_nulls, &val_count);
+ deconstruct_array_builtin(key_array, TEXTOID, &key_datums, &key_nulls, &key_count);
+ deconstruct_array_builtin(val_array, TEXTOID, &val_datums, &val_nulls, &val_count);
if (key_count != val_count)
ereport(ERROR,