Skip to content

Fix struct name collision caused by upstream PostgreSQL change - #437

Merged
jcflack merged 8 commits into
REL1_6_STABLEfrom
trackpg/REL1_6_STABLE/issue410
May 30, 2023
Merged

jcflack merged 8 commits into
REL1_6_STABLEfrom
trackpg/REL1_6_STABLE/issue410

Conversation

@jcflack

@jcflack jcflack commented May 30, 2023

Copy link
Copy Markdown
Contributor

Addresses #410. In postgres/postgres@639a86e, the Value flavor of Node struct was retired, and Integer, Float, String, and BitString became Node structs in their own right; the name String collides with the one in PL/Java's String.c. An easy solution is to change the name of the latter.

Thanks to Francisco Miguel Biete Banon; tested by Christoph Berg, tayalrun1, Frank Blanning, aadrian, Yuril Rashkovskii.

The upstream change made changes in nodeToString in outfuncs.c, but only as needed to preserve the original pg_node_tree syntax, so no attention to PgNodeTreeAsXML is needed. (It would be good for that to have a regression test, on general principles.)

jcflack and others added 8 commits October 18, 2020 19:56
It is not recommended for production. Released versions at the moment
are from REL1_6_STABLE (relatively modern, Java 9+, PostgreSQL 9.5+)
or from REL1_5_STABLE (if support for Java < 9 or PostgreSQL < 9.5
is needed).
String is a PostgreSQL type, rename pljava String to PLJString
Addresses #410. In postgres/postgres@639a86e, the 'Value' Node
struct was retired, and Integer, Float, String, and BitString
became Node structs in their own right; the name String collides
with the one in PL/Java's String.c. An easy solution is to change
the name of the latter.

Tested by Christoph Berg, tayalrun1, Frank Blanning, aadrian, Yuril
Rashkovskii.

The upstream change made changes in nodeToString in outfuncs.c,
but only as needed to preserve the original pg_node_tree syntax,
so no attention to PgNodeTreeAsXML is needed. (It would be good
for that to have a regression test, on general principles.)
@jcflack jcflack mentioned this pull request May 30, 2023
@jcflack
jcflack merged commit 8a41b36 into REL1_6_STABLE May 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant