Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix: revert to ignoring erroneous parameter values if they are not used
Core API users used to be allowed to pass in arbitrary objects as parameters. If these were not used by Cypher, we would silently ignore them. From 3.4.0 this was changed to always fail the query if any parameter was not convertible to a cypher type. This commits reverts to the previous lenient behaviour, as this change caused problems for some users.
- Loading branch information
Showing
8 changed files
with
140 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
community/values/src/main/java/org/neo4j/values/virtual/ErrorValue.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,79 @@ | |||
/* | |||
* Copyright (c) 2002-2018 "Neo4j," | |||
* Neo4j Sweden AB [http://neo4j.com] | |||
* | |||
* This file is part of Neo4j. | |||
* | |||
* Neo4j is free software: you can redistribute it and/or modify | |||
* it under the terms of the GNU General Public License as published by | |||
* the Free Software Foundation, either version 3 of the License, or | |||
* (at your option) any later version. | |||
* | |||
* This program is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
* GNU General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU General Public License | |||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
*/ | |||
package org.neo4j.values.virtual; | |||
|
|||
|
|||
import java.util.Comparator; | |||
|
|||
import org.neo4j.values.AnyValue; | |||
import org.neo4j.values.AnyValueWriter; | |||
import org.neo4j.values.ValueMapper; | |||
import org.neo4j.values.VirtualValue; | |||
import org.neo4j.values.utils.InvalidValuesArgumentException; | |||
|
|||
/** | |||
* The ErrorValue allow delaying errors in value creation until runtime, which is useful | |||
* if it turns out that the value is never used. | |||
*/ | |||
public final class ErrorValue extends VirtualValue | |||
{ | |||
private final InvalidValuesArgumentException e; | |||
|
|||
ErrorValue( Exception e ) | |||
{ | |||
this.e = new InvalidValuesArgumentException( e.getMessage() ); | |||
} | |||
|
|||
@Override | |||
public boolean equals( VirtualValue other ) | |||
{ | |||
throw e; | |||
} | |||
|
|||
@Override | |||
public VirtualValueGroup valueGroup() | |||
{ | |||
return VirtualValueGroup.ERROR; | |||
} | |||
|
|||
@Override | |||
public int compareTo( VirtualValue other, Comparator<AnyValue> comparator ) | |||
{ | |||
throw e; | |||
} | |||
|
|||
@Override | |||
protected int computeHash() | |||
{ | |||
throw e; | |||
} | |||
|
|||
@Override | |||
public <E extends Exception> void writeTo( AnyValueWriter<E> writer ) | |||
{ | |||
throw e; | |||
} | |||
|
|||
@Override | |||
public <T> T map( ValueMapper<T> mapper ) | |||
{ | |||
throw e; | |||
} | |||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
|
@@ -31,4 +31,5 @@ public enum VirtualValueGroup | ||
LIST, | LIST, | ||
PATH, | PATH, | ||
NO_VALUE, | NO_VALUE, | ||
ERROR | |||
} | } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters