Skip to content

Fix a bug that survived into the recent Operator annotation PR#332

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

Merged
jcflack merged 2 commits into from
Nov 22, 2020
Merged

Fix a bug that survived into the recent Operator annotation PR #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e6955a
Fix copy-pasto in Operator annotation checking
jcflack Nov 20, 2020
165fe6f
Fix a lint warning
jcflack Nov 21, 2020
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
4 changes: 2 additions & 2 deletions pljava-api/src/main/java/org/postgresql/pljava/annotation/processing/DDRProcessor.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3681,7 +3681,7 @@ else if ( ! funcName.equals(fn) && ! isSynthetic )
long explicit =
Arrays.stream(operands).filter(Objects::nonNull).count();

if ( 0 != explicit && ! isSynthetic )
if ( 0 != explicit && isSynthetic )
{
msg(Kind.ERROR, m_targetElement, m_origin,
"@Operator with synthetic= must not specify " +
Expand DownExpand Up@@ -4442,7 +4442,7 @@ else if ( null == _plan.stateType )
.skip(1) // skip the state argument
.map(pi ->
(Map.Entry<Identifier.Simple, DBType>)
new AbstractMap.SimpleImmutableEntry(
new AbstractMap.SimpleImmutableEntry<>(
Identifier.Simple.fromJava(
pi.name()
),
Expand Down
7 changes: 7 additions & 0 deletions pljava-examples/src/main/java/org/postgresql/pljava/example/annotation/ComplexScalar.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,9 +98,16 @@ public class ComplexScalar implements SQLData {

/**
* Return the same 'complex' passed in, logging its contents at level INFO.
*<p>
* Also create an unnecessary {@code <<} operator for this, with an equally
* unnecessary explicit operand type, simply as a regression test
* of issue #330.
* @param cpl any instance of this UDT
* @return the same instance passed in
*/
@Operator(
name = "javatest.<<", right = "javatest.complex"
)
@Function(
schema="javatest", name="logcomplex", effects=IMMUTABLE,
onNullInput=RETURNS_NULL)
Expand Down