From ce3a9bdf872a053d4278e54cae8cb2b8005e77a4 Mon Sep 17 00:00:00 2001 From: Richard Newman Date: Mon, 6 Mar 2017 20:16:45 -0800 Subject: [PATCH] (#362) Part 2: use constrain_attribute. r=nalexander --- query-algebrizer/src/cc.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/query-algebrizer/src/cc.rs b/query-algebrizer/src/cc.rs index 4f196b07..3240dc3a 100644 --- a/query-algebrizer/src/cc.rs +++ b/query-algebrizer/src/cc.rs @@ -552,11 +552,11 @@ impl ConjoiningClauses { self.mark_known_empty("Attribute entid isn't an attribute."); return; } - self.constrain_column_to_entity(col.clone(), DatomsColumn::Attribute, entid) + self.constrain_attribute(col.clone(), entid) }, PatternNonValuePlace::Ident(ref ident) => { if let Some(entid) = self.entid_for_ident(schema, ident) { - self.constrain_column_to_entity(col.clone(), DatomsColumn::Attribute, entid); + self.constrain_attribute(col.clone(), entid); if !schema.is_attribute(entid) { self.mark_known_empty("Attribute ident isn't an attribute."); @@ -580,6 +580,7 @@ impl ConjoiningClauses { match pattern.value { PatternValuePlace::Placeholder => (), + PatternValuePlace::Variable(ref v) => { if let Some(this_type) = value_type { // Wouldn't it be nice if we didn't need to clone in the found case?