diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/amazon/carbonado/qe/StandardQuery.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/com/amazon/carbonado/qe/StandardQuery.java b/src/main/java/com/amazon/carbonado/qe/StandardQuery.java index c1038c7..ec9bf4e 100644 --- a/src/main/java/com/amazon/carbonado/qe/StandardQuery.java +++ b/src/main/java/com/amazon/carbonado/qe/StandardQuery.java @@ -143,8 +143,11 @@ public abstract class StandardQuery<S extends Storable> extends AbstractQuery<S> if (mValues == null) {
newValues = filter.initialFilterValues();
} else {
+ if (getBlankParameterCount() > 0) {
+ throw new IllegalStateException("Blank parameters exist in query: " + this);
+ }
newValues = mValues.getFilter().and(filter)
- .initialFilterValues().withValues(mValues.getValues());
+ .initialFilterValues().withValues(mValues.getSuppliedValues());
}
return createQuery(newValues, mOrdering);
}
@@ -153,8 +156,11 @@ public abstract class StandardQuery<S extends Storable> extends AbstractQuery<S> if (mValues == null) {
throw new IllegalStateException("Query is already guaranteed to fetch everything");
}
+ if (getBlankParameterCount() > 0) {
+ throw new IllegalStateException("Blank parameters exist in query: " + this);
+ }
FilterValues<S> newValues = mValues.getFilter().or(filter)
- .initialFilterValues().withValues(mValues.getValues());
+ .initialFilterValues().withValues(mValues.getSuppliedValues());
return createQuery(newValues, mOrdering);
}
|