MoreThanText/morethantext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved some update errors into lib testing.
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1s
Details

Browse Source
This commit is contained in:
Jeff Baskin
2026-03-02 08:47:40 -05:00
parent f8b5b477ee
commit d41b5ff418
3 changed files with 75 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/document/create.rs
View File

@@ -599,14 +599,12 @@ impl DocumentFile {
let mut err =
MTTError::new(ErrorID::FieldTypeExpected(expected_type.clone()));
err.add_parent(ErrorID::Field(field.clone()));
err.add_parent(ErrorID::Document(query.doc_name().clone()));
return Err(err);
}
fid
}
Err(mut err) => {
err.add_parent(ErrorID::Field(field.clone()));
err.add_parent(ErrorID::Document(query.doc_name().clone()));
return Err(err);
}
};
@@ -659,7 +657,8 @@ impl DocumentFile {
};
let records = match self.run_query(query) {
Ok(data) => data,
Err(err) => {
Err(mut err) => {
err.add_parent(ErrorID::Document(msg.doc_name().into()));
let reply = msg.response(err);
self.queue.send(reply);
return;
@@ -683,8 +682,20 @@ impl DocumentFile {
let mut changes: HashMap<NameID, &CalcValue> = HashMap::new();
for (key, value) in update.get_values().iter() {
let field_id = match self.docdef.get_field_id(key) {
Ok(data) => data,
Err(err) => return Err(err),
Ok(id) => {
let expected_type = self.docdef.get_field_type(key.clone()).unwrap();
if &value.get_type() != expected_type {
let mut err =
MTTError::new(ErrorID::FieldTypeExpected(expected_type.clone()));
err.add_parent(ErrorID::Field(key.clone()));
return Err(err);
}
id
}
Err(mut err) => {
err.add_parent(ErrorID::Field(key.clone()));
return Err(err);
}
};
changes.insert(field_id, value);
}
@@ -733,7 +744,8 @@ impl DocumentFile {
};
let original = match self.run_query(update.get_query()) {
Ok(result) => result,
Err(err) => {
Err(mut err) => {
err.add_parent(ErrorID::Document(msg.doc_name().into()));
let reply = msg.response(err);
self.queue.send(reply);
return;
@@ -741,7 +753,8 @@ impl DocumentFile {
};
let data = match self.run_update(&original, update, msg) {
Ok(output) => output,
Err(err) => {
Err(mut err) => {
err.add_parent(ErrorID::Document(msg.doc_name().into()));
let reply = msg.response(err);
self.queue.send(reply);
return;
@@ -1778,7 +1791,6 @@ mod document_files {
testing(Message::new(update));
testing(Message::new(Query::new(doc_name.clone())));
}
*/
#[test]
fn update_errors_on_bad_field_name() {
@@ -1834,6 +1846,7 @@ mod document_files {
_ => unreachable!("got {:?}: should have gotten an error", action),
}
}
*/
#[test]
fn does_update_maintain_unique_fields() {