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

Ensure :db/index true for :db/unique _. Fixes #254. r=nalexander (#267)

Browse source
This commit is contained in:
Jordan Santell 2017-02-08 15:26:45 -08:00 committed by GitHub
parent 9fcf9f3318
commit 688a644bd9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
db/src/schema.rs
View file

@ -19,6 +19,10 @@ fn validate_schema_map(entid_map: &EntidMap, schema_map: &SchemaMap) -> Result<(
for (entid, attribute) in schema_map { for (entid, attribute) in schema_map {
let ident = entid_map.get(entid).ok_or(ErrorKind::BadSchemaAssertion(format!("Could not get ident for entid: {}", entid)))?; let ident = entid_map.get(entid).ok_or(ErrorKind::BadSchemaAssertion(format!("Could not get ident for entid: {}", entid)))?;
if attribute.unique_value && !attribute.index {
bail!(ErrorKind::BadSchemaAssertion(format!(":db/unique :db/unique_value true without :db/index true for entid: {}", ident)))
}
if attribute.unique_identity && !attribute.unique_value { if attribute.unique_identity && !attribute.unique_value {
bail!(ErrorKind::BadSchemaAssertion(format!(":db/unique :db/unique_identity without :db/unique :db/unique_value for entid: {}", ident))) bail!(ErrorKind::BadSchemaAssertion(format!(":db/unique :db/unique_identity without :db/unique :db/unique_value for entid: {}", ident)))
} }
@ -106,10 +110,14 @@ impl Schema {
entids::DB_UNIQUE => { entids::DB_UNIQUE => {
match *value { match *value {
TypedValue::Ref(entids::DB_UNIQUE_VALUE) => { attributes.unique_value = true; }, TypedValue::Ref(entids::DB_UNIQUE_VALUE) => {
attributes.unique_value = true;
attributes.index = true;
},
TypedValue::Ref(entids::DB_UNIQUE_IDENTITY) => { TypedValue::Ref(entids::DB_UNIQUE_IDENTITY) => {
attributes.unique_value = true; attributes.unique_value = true;
attributes.unique_identity = true; attributes.unique_identity = true;
attributes.index = true;
}, },
_ => bail!(ErrorKind::BadSchemaAssertion(format!("Expected [... :db/unique :db.unique/value|:db.unique/identity] but got [... :db/unique {:?}]", value))) _ => bail!(ErrorKind::BadSchemaAssertion(format!("Expected [... :db/unique :db.unique/value|:db.unique/identity] but got [... :db/unique {:?}]", value)))
} }