mirror of
https://github.com/postgres/postgres.git
synced 2025-10-15 05:46:52 +03:00
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
This commit is contained in:
@@ -1177,8 +1177,7 @@ transformRelOptions(Datum oldOptions, List *defList, const char *namspace,
|
||||
int noldoptions;
|
||||
int i;
|
||||
|
||||
deconstruct_array(array, TEXTOID, -1, false, TYPALIGN_INT,
|
||||
&oldoptions, NULL, &noldoptions);
|
||||
deconstruct_array_builtin(array, TEXTOID, &oldoptions, NULL, &noldoptions);
|
||||
|
||||
for (i = 0; i < noldoptions; i++)
|
||||
{
|
||||
@@ -1345,8 +1344,7 @@ untransformRelOptions(Datum options)
|
||||
|
||||
array = DatumGetArrayTypeP(options);
|
||||
|
||||
deconstruct_array(array, TEXTOID, -1, false, TYPALIGN_INT,
|
||||
&optiondatums, NULL, &noptions);
|
||||
deconstruct_array_builtin(array, TEXTOID, &optiondatums, NULL, &noptions);
|
||||
|
||||
for (i = 0; i < noptions; i++)
|
||||
{
|
||||
@@ -1436,8 +1434,7 @@ parseRelOptionsInternal(Datum options, bool validate,
|
||||
int noptions;
|
||||
int i;
|
||||
|
||||
deconstruct_array(array, TEXTOID, -1, false, TYPALIGN_INT,
|
||||
&optiondatums, NULL, &noptions);
|
||||
deconstruct_array_builtin(array, TEXTOID, &optiondatums, NULL, &noptions);
|
||||
|
||||
for (i = 0; i < noptions; i++)
|
||||
{
|
||||
|
Reference in New Issue
Block a user