greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Packages Projects Releases 9 Wiki Activity

Part 2: add an EmptyBecause case for fulltext/non-string type mismatch.

Browse source
This commit is contained in:
Richard Newman 2017-03-27 20:36:03 -07:00
parent 997df0b776
commit 01ca0ae5c1
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
query-algebrizer/src/cc.rs
View file

@ -173,6 +173,9 @@ impl Debug for EmptyBecause {
&NonNumericArgument => { &NonNumericArgument => {
write!(f, "Non-numeric argument in numeric place") write!(f, "Non-numeric argument in numeric place")
}, },
&NonStringFulltextValue => {
write!(f, "Non-string argument for fulltext attribute")
},
&UnresolvedIdent(ref kw) => { &UnresolvedIdent(ref kw) => {
write!(f, "Couldn't resolve keyword {}", kw) write!(f, "Couldn't resolve keyword {}", kw)
}, },

3
query-algebrizer/src/types.rs
View file

@ -297,11 +297,12 @@ impl Debug for ColumnConstraint {
} }
} }
#[derive(PartialEq)] #[derive(PartialEq, Clone)]
pub enum EmptyBecause { pub enum EmptyBecause {
// Var, existing, desired. // Var, existing, desired.
TypeMismatch(Variable, HashSet<ValueType>, ValueType), TypeMismatch(Variable, HashSet<ValueType>, ValueType),
NonNumericArgument, NonNumericArgument,
NonStringFulltextValue,
UnresolvedIdent(NamespacedKeyword), UnresolvedIdent(NamespacedKeyword),
InvalidAttributeIdent(NamespacedKeyword), InvalidAttributeIdent(NamespacedKeyword),
InvalidAttributeEntid(Entid), InvalidAttributeEntid(Entid),