Address review comments r=rnewman
This commit is contained in:
parent
9c677a5bb1
commit
58e43a878a
3 changed files with 22 additions and 15 deletions
|
@ -611,15 +611,8 @@ impl ConjoiningClauses {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Ensure that the given place has the correct types to be a tx-id.
|
/// Ensure that the given place has the correct types to be a tx-id.
|
||||||
/// Right now this is mostly unimplemented: we fail hard if anything but a placeholder is
|
|
||||||
/// present.
|
|
||||||
fn constrain_to_tx(&mut self, tx: &PatternNonValuePlace) {
|
fn constrain_to_tx(&mut self, tx: &PatternNonValuePlace) {
|
||||||
match *tx {
|
self.constrain_to_ref(tx);
|
||||||
PatternNonValuePlace::Variable(ref v) => self.constrain_var_to_type(v.clone(), ValueType::Ref),
|
|
||||||
PatternNonValuePlace::Placeholder |
|
|
||||||
PatternNonValuePlace::Entid(_) |
|
|
||||||
PatternNonValuePlace::Ident(_) => (),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Ensure that the given place can be an entity, and is congruent with existing types.
|
/// Ensure that the given place can be an entity, and is congruent with existing types.
|
||||||
|
|
|
@ -241,14 +241,15 @@ impl ConjoiningClauses {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO pattern.tx -> like handling entity place
|
|
||||||
// carefully read Datomic query doc to check for correct handling
|
|
||||||
match pattern.tx {
|
match pattern.tx {
|
||||||
PatternNonValuePlace::Placeholder => (),
|
PatternNonValuePlace::Placeholder => (),
|
||||||
PatternNonValuePlace::Variable(ref v) => {
|
PatternNonValuePlace::Variable(ref v) => {
|
||||||
self.bind_column_to_var(schema, col.clone(), DatomsColumn::Tx, v.clone());
|
self.bind_column_to_var(schema, col.clone(), DatomsColumn::Tx, v.clone());
|
||||||
},
|
},
|
||||||
PatternNonValuePlace::Entid(entid) => {
|
PatternNonValuePlace::Entid(entid) => {
|
||||||
|
// TODO: we want to check whether the tx-id is within range for the database's tx partition.
|
||||||
|
// (That applies after ident lookup, too.)
|
||||||
|
// Possible solution: https://github.com/mozilla/mentat/tree/fluffyemily/tx-id-check
|
||||||
self.constrain_column_to_entity(col.clone(), DatomsColumn::Tx, entid);
|
self.constrain_column_to_entity(col.clone(), DatomsColumn::Tx, entid);
|
||||||
},
|
},
|
||||||
PatternNonValuePlace::Ident(ref ident) => {
|
PatternNonValuePlace::Ident(ref ident) => {
|
||||||
|
|
|
@ -263,10 +263,16 @@ fn test_tx() {
|
||||||
[:db/add "s" :db/ident :foo/uuid]
|
[:db/add "s" :db/ident :foo/uuid]
|
||||||
[:db/add "s" :db/valueType :db.type/uuid]
|
[:db/add "s" :db/valueType :db.type/uuid]
|
||||||
[:db/add "s" :db/cardinality :db.cardinality/one]
|
[:db/add "s" :db/cardinality :db.cardinality/one]
|
||||||
]"#).unwrap();
|
]"#).expect("successful transaction");
|
||||||
|
|
||||||
let t = conn.transact(&mut c, r#"[
|
let t = conn.transact(&mut c, r#"[
|
||||||
[:db/add "u" :foo/uuid #uuid "cf62d552-6569-4d1b-b667-04703041dfc4"]
|
[:db/add "u" :foo/uuid #uuid "cf62d552-6569-4d1b-b667-04703041dfc4"]
|
||||||
]"#).unwrap();
|
]"#).expect("successful transaction");
|
||||||
|
|
||||||
|
conn.transact(&mut c, r#"[
|
||||||
|
[:db/add "u" :foo/uuid #uuid "550e8400-e29b-41d4-a716-446655440000"]
|
||||||
|
]"#).expect("successful transaction");
|
||||||
|
|
||||||
let r = conn.q_once(&mut c,
|
let r = conn.q_once(&mut c,
|
||||||
r#"[:find ?tx
|
r#"[:find ?tx
|
||||||
:where [?x :foo/uuid #uuid "cf62d552-6569-4d1b-b667-04703041dfc4" ?tx]]"#, None);
|
:where [?x :foo/uuid #uuid "cf62d552-6569-4d1b-b667-04703041dfc4" ?tx]]"#, None);
|
||||||
|
@ -288,10 +294,17 @@ fn test_tx_as_input() {
|
||||||
[:db/add "s" :db/ident :foo/uuid]
|
[:db/add "s" :db/ident :foo/uuid]
|
||||||
[:db/add "s" :db/valueType :db.type/uuid]
|
[:db/add "s" :db/valueType :db.type/uuid]
|
||||||
[:db/add "s" :db/cardinality :db.cardinality/one]
|
[:db/add "s" :db/cardinality :db.cardinality/one]
|
||||||
]"#).unwrap();
|
]"#).expect("successful transaction");
|
||||||
|
conn.transact(&mut c, r#"[
|
||||||
|
[:db/add "u" :foo/uuid #uuid "550e8400-e29b-41d4-a716-446655440000"]
|
||||||
|
]"#).expect("successful transaction");
|
||||||
let t = conn.transact(&mut c, r#"[
|
let t = conn.transact(&mut c, r#"[
|
||||||
[:db/add "u" :foo/uuid #uuid "cf62d552-6569-4d1b-b667-04703041dfc4"]
|
[:db/add "u" :foo/uuid #uuid "cf62d552-6569-4d1b-b667-04703041dfc4"]
|
||||||
]"#).unwrap();
|
]"#).expect("successful transaction");
|
||||||
|
conn.transact(&mut c, r#"[
|
||||||
|
[:db/add "u" :foo/uuid #uuid "267bab92-ee39-4ca2-b7f0-1163a85af1fb"]
|
||||||
|
]"#).expect("successful transaction");
|
||||||
|
|
||||||
let tx = (Variable::from_valid_name("?tx"), TypedValue::Ref(t.tx_id));
|
let tx = (Variable::from_valid_name("?tx"), TypedValue::Ref(t.tx_id));
|
||||||
let inputs = QueryInputs::with_value_sequence(vec![tx]);
|
let inputs = QueryInputs::with_value_sequence(vec![tx]);
|
||||||
let r = conn.q_once(&mut c,
|
let r = conn.q_once(&mut c,
|
||||||
|
@ -301,7 +314,7 @@ fn test_tx_as_input() {
|
||||||
match r {
|
match r {
|
||||||
Result::Ok(QueryResults::Rel(ref v)) => {
|
Result::Ok(QueryResults::Rel(ref v)) => {
|
||||||
assert_eq!(*v, vec![
|
assert_eq!(*v, vec![
|
||||||
vec![TypedValue::Uuid(Uuid::from_str("cf62d552-6569-4d1b-b667-04703041dfc4").unwrap()),]
|
vec![TypedValue::Uuid(Uuid::from_str("cf62d552-6569-4d1b-b667-04703041dfc4").expect("Valid UUID")),]
|
||||||
]);
|
]);
|
||||||
},
|
},
|
||||||
_ => panic!("Expected query to work."),
|
_ => panic!("Expected query to work."),
|
||||||
|
|
Loading…
Reference in a new issue