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

Moved delete into action module.
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 0s
Details

Browse Source
This commit is contained in:
Jeff Baskin
2026-02-16 08:28:59 -05:00
parent e2bb5bb93f
commit d47124656f
6 changed files with 90 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/document/create.rs
View File

@@ -845,9 +845,8 @@ impl DocumentFile {
mod document_files {
use super::*;
use crate::{
action::{Addition, FieldType, Operand, Show},
action::{Addition, Delete, FieldType, Operand, Show},
document::Clock,
message::wrapper::Delete,
name::{Name, Names},
support_tests::TIMEOUT,
};
@@ -1003,7 +1002,7 @@ mod document_files {
let queue = test_doc.get_queue();
let msg_actions = [
MsgAction::Addition(Addition::new(name.clone())),
MsgAction::Delete(Delete::new(Query::internal())),
MsgAction::Delete(Delete::new(name.clone())),
MsgAction::Query(Query::new(name.clone())),
MsgAction::Show(Show::new(name.clone())),
MsgAction::Update(Update::new(Query::internal())),
@@ -1055,7 +1054,7 @@ mod document_files {
let msg_actions = [
MsgAction::Addition(Addition::new(alt.clone())),
MsgAction::Create(DocDef::new(name.clone())),
MsgAction::Delete(Delete::new(Query::new(alt.clone()))),
MsgAction::Delete(Delete::new(name.clone())),
MsgAction::Query(Query::internal().into()),
MsgAction::Show(Show::new(name.clone())),
MsgAction::Update(Update::new(Query::internal())),
@@ -1179,7 +1178,7 @@ mod document_files {
for item in data.iter() {
test_doc.populate([item.clone()].to_vec());
}
let msg = Message::new(doc_name.clone(), Delete::new(Query::internal()));
let msg = Message::new(doc_name.clone(), Delete::new(doc_name.clone()));
queue.send(msg.clone());
let result = test_doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
assert_eq!(
@@ -2267,9 +2266,9 @@ mod document_files {
calc.add_value(1).unwrap();
calc.add_value(CalcValue::Existing(FieldType::Integer))
.unwrap();
let mut query = Query::new(doc.doc_name());
query.add(&fname, calc);
let delete = Delete::new(query.clone());
let mut delete = Delete::new(doc.doc_name());
let query = delete.get_query_mut();
query.add(&fname, calc.clone());
doc.send(delete);
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
@@ -2285,7 +2284,9 @@ mod document_files {
}
_ => unreachable!("got {:?}: should have gotten reply", action),
}
doc.send(query);
let mut result_query = Query::new(doc.doc_name());
result_query.add(&fname, calc.clone());
doc.send(result_query);
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
match action {
@@ -2303,9 +2304,9 @@ mod document_files {
calc.add_value(CalcValue::Existing(FieldType::Integer))
.unwrap();
calc.add_value(1).unwrap();
let mut query = Query::internal();
let mut delete = Delete::new(doc.doc_name());
let query = delete.get_query_mut();
query.add(field_name.clone(), calc);
let delete = Delete::new(query);
doc.send(delete);
let result = doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let action = result.get_action();
@@ -2328,7 +2329,7 @@ mod document_files {
.unwrap();
doc.start(standard_paths());
doc.populate([value.into()].to_vec());
doc.send(Delete::new(Query::internal()));
doc.send(Delete::new(doc.doc_name()));
doc.get_receiver().recv_timeout(TIMEOUT).unwrap();
let mut addition = Addition::new(doc.doc_name());
addition.add_field(&fname, value.clone());
@@ -2406,9 +2407,9 @@ mod document_files {
calc.add_value(CalcValue::Existing(FieldType::Integer))
.unwrap();
calc.add_value(1).unwrap();
let mut query = Query::internal();
let mut delete = Delete::new(doc_name.clone());
let query = delete.get_query_mut();
query.add(Name::english("field0"), calc);
let delete = Delete::new(query.clone());
let path = Path::new(
Include::All,
Include::Just(Name::english("clock").into()),

8
src/document/session.rs
View File

@@ -1,11 +1,11 @@
use crate::{
action::{Action, CalcValue, Calculation, FieldType, Operand, Query},
action::{Action, CalcValue, Calculation, Delete, FieldType, Operand, Query},
document::{
clock::Clock,
create::IndexType,
definition::{DocDef, DocFuncType},
},
message::wrapper::{Delete, Message, Update},
message::wrapper::{Message, Update},
name::{Name, NameType},
queue::{
data_director::{Include, Path, RegMsg, Register},
@@ -52,14 +52,14 @@ impl Session {
let query_action = DocFuncType::ExistingQuery(update.into());
docdef.add_route(path, query_action);
let mut delete_qry = Query::internal();
let mut delete = Delete::new(Session::doc_names()[0].clone());
let delete_qry = delete.get_query_mut();
let mut delete_calc = Calculation::new(Operand::LessThan);
delete_calc.add_value(FieldType::DateTime).unwrap();
delete_calc
.add_value(CalcValue::Existing(FieldType::DateTime))
.unwrap();
delete_qry.add(name_expire.clone(), delete_calc);
let delete = Delete::new(delete_qry);
let delete_func = DocFuncType::Trigger(delete.into());
docdef.add_route(Clock::get_path(), delete_func);