Skip to content

Put type modifier between parentheses and quotes #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
M-Butter wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −2
Open

Put type modifier between parentheses and quotes #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ OBJS = src/collection.o \
src/icollection_subs.o \
src/icollection_parse.o

REGRESS = basics subscript iteration srf persistence inout_params mixed_types stress edge_cases array_interop
REGRESS = basics subscript iteration srf persistence inout_params mixed_types stress edge_cases array_interop typemod
REGRESS_OPTS = --inputdir=test --outputdir=test --load-extension=collection

EXTRA_CLEAN = test/results/ test/regression.diffs test/regression.out \
Expand Down
8 changes: 7 additions & 1 deletion src/collection_common.c
View file
Open in desktop

@jim-mlodgenski jim-mlodgenski Jun 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of the explicit palloc, this can be tightened up a bit using psprintf. Something like:
return psprintf("('%s')", typeName);

Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,13 @@ collection_typmodin_common(ArrayType *ta, const char *type_name)
char *
collection_typmodout_common(Oid typmod)
{
return DatumGetCString(DirectFunctionCall1(regtypeout, typmod));
char *typeName;
char *res;

typeName = DatumGetCString(DirectFunctionCall1(regtypeout, typmod));
res = (char*)palloc(strlen(typeName) + 5);
sprintf(res, "('%s')", typeName);
return res;
}

/*
Expand Down
18 changes: 18 additions & 0 deletions test/expected/typemod.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
create schema typemodtest;
create type typemodtest.my_rec as (
coll_no_typemod collection,
coll_typemod_int collection('int'),
icoll_no_typemod icollection,
icollection_typemod_varchar icollection('varchar')
);
\d typemodtest.my_rec
Composite type "typemodtest.my_rec"
Column | Type | Collation | Nullable | Default
-----------------------------+----------------------------------+-----------+----------+---------
coll_no_typemod | collection | | |
coll_typemod_int | collection('integer') | | |
icoll_no_typemod | icollection | | |
icollection_typemod_varchar | icollection('character varying') | | |

drop schema typemodtest cascade;
NOTICE: drop cascades to type typemodtest.my_rec
9 changes: 9 additions & 0 deletions test/sql/typemod.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
create schema typemodtest;
create type typemodtest.my_rec as (
coll_no_typemod collection,
coll_typemod_int collection('int'),
icoll_no_typemod icollection,
icollection_typemod_varchar icollection('varchar')
);
\d typemodtest.my_rec
drop schema typemodtest cascade;