Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[server] Search ids are not injected with previous queries #1192 #1198

Merged
merged 4 commits into from
Aug 10, 2024
Merged

[server] Search ids are not injected with previous queries #1192 #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9245a40
Update main.rs
michaelvlach Aug 10, 2024
2a4bcde
Update api.rs
michaelvlach Aug 10, 2024
5858eed
Update db_exec_test.rs
michaelvlach Aug 10, 2024
994458f
Update db_pool.rs
michaelvlach Aug 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agdb_api/rust/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ impl<T: HttpClient> AgdbApi<T> {
&self,
owner: &str,
db: &str,
queries: &Vec<QueryType>,
queries: &[QueryType],
) -> AgdbApiResult<(u16, Vec<QueryResult>)> {
self.client
.post(
Expand Down
2 changes: 2 additions & 0 deletions agdb_server/src/db_pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,15 @@ fn t_exec_mut(
}
QueryType::InsertEdges(q) => {
do_audit = true;
inject_results(&mut q.ids, results)?;
inject_results(&mut q.from, results)?;
inject_results(&mut q.to, results)?;

t.exec_mut(q)
}
QueryType::InsertNodes(q) => {
do_audit = true;
inject_results(&mut q.ids, results)?;
t.exec_mut(q)
}
QueryType::InsertValues(q) => {
Expand Down
186 changes: 184 additions & 2 deletions agdb_server/tests/routes/db_exec_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::TestServer;
use crate::ADMIN;
use agdb::CountComparison;
use agdb::DbElement;
use agdb::DbId;
use agdb::QueryBuilder;
Expand Down Expand Up @@ -408,6 +409,187 @@ async fn use_result_in_search() -> anyhow::Result<()> {
Ok(())
}

#[tokio::test]
async fn use_result_in_insert_ids() -> anyhow::Result<()> {
let mut server = TestServer::new().await?;
let owner = &server.next_user_name();
let db = &server.next_db_name();
server.api.user_login(ADMIN, ADMIN).await?;
server.api.admin_user_add(owner, owner).await?;
server.api.user_login(owner, owner).await?;
server.api.db_add(owner, db, DbType::Mapped).await?;
let queries = &vec![
QueryBuilder::insert()
.nodes()
.aliases("root")
.query()
.into(),
QueryBuilder::insert()
.nodes()
.ids(
QueryBuilder::search()
.from("root")
.where_()
.node()
.and()
.distance(CountComparison::Equal(2))
.query(),
)
.count(3)
.query()
.into(),
QueryBuilder::insert()
.edges()
.ids(
QueryBuilder::search()
.from("root")
.to(":1")
.where_()
.edge()
.query(),
)
.from(":0")
.to(":1")
.query()
.into(),
QueryBuilder::search().from(":0").to(":1").query().into(),
];
let (status, results) = server.api.db_exec(owner, db, queries).await?;
assert_eq!(status, 200);
assert_eq!(
results[3],
QueryResult {
result: 3,
elements: vec![
DbElement {
id: DbId(1),
from: None,
to: None,
values: vec![]
},
DbElement {
id: DbId(-5),
from: Some(DbId(1)),
to: Some(DbId(2)),
values: vec![]
},
DbElement {
id: DbId(2),
from: None,
to: None,
values: vec![]
}
]
}
);
Ok(())
}

#[tokio::test]
async fn reentrant_queries() -> anyhow::Result<()> {
let mut server = TestServer::new().await?;
let owner = &server.next_user_name();
let db = &server.next_db_name();
server.api.user_login(ADMIN, ADMIN).await?;
server.api.admin_user_add(owner, owner).await?;
server.api.user_login(owner, owner).await?;
server.api.db_add(owner, db, DbType::Mapped).await?;
let queries = &vec![
QueryBuilder::insert()
.nodes()
.aliases("root")
.query()
.into(),
QueryBuilder::insert()
.nodes()
.ids(
QueryBuilder::search()
.from(":0")
.where_()
.node()
.and()
.distance(CountComparison::Equal(2))
.query(),
)
.count(3)
.query()
.into(),
QueryBuilder::search()
.from(":0")
.to(":1")
.where_()
.edge()
.query()
.into(),
QueryBuilder::insert()
.edges()
.ids(":2")
.from(":0")
.to(":1")
.query()
.into(),
QueryBuilder::search().from(":0").to(":1").query().into(),
QueryBuilder::search().from(":0").to(":1").query().into(),
];
let (status, results) = server.api.db_exec(owner, db, queries).await?;
assert_eq!(status, 200);
assert_eq!(
results[4],
QueryResult {
result: 3,
elements: vec![
DbElement {
id: DbId(1),
from: None,
to: None,
values: vec![]
},
DbElement {
id: DbId(-5),
from: Some(DbId(1)),
to: Some(DbId(2)),
values: vec![]
},
DbElement {
id: DbId(2),
from: None,
to: None,
values: vec![]
}
]
}
);
let (status, results) = server.api.db_exec(owner, db, queries).await?;
assert_eq!(status, 200);
assert_eq!(
results[4],
QueryResult {
result: 3,
elements: vec![
DbElement {
id: DbId(1),
from: None,
to: None,
values: vec![]
},
DbElement {
id: DbId(-7),
from: Some(DbId(1)),
to: Some(DbId(4)),
values: vec![]
},
DbElement {
id: DbId(4),
from: None,
to: None,
values: vec![]
}
]
}
);
Ok(())
}

#[tokio::test]
async fn use_result_in_search_bad_query() -> anyhow::Result<()> {
let mut server = TestServer::new().await?;
Expand Down Expand Up @@ -544,7 +726,7 @@ async fn db_not_found() -> anyhow::Result<()> {
server.api.user_login(owner, owner).await?;
let status = server
.api
.db_exec(owner, "db", &vec![])
.db_exec(owner, "db", &[])
.await
.unwrap_err()
.status;
Expand All @@ -557,7 +739,7 @@ async fn no_token() -> anyhow::Result<()> {
let server = TestServer::new().await?;
let status = server
.api
.db_exec("user", "db", &vec![])
.db_exec("user", "db", &[])
.await
.unwrap_err()
.status;
Expand Down
2 changes: 1 addition & 1 deletion examples/indexes/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fn main() -> Result<(), QueryError> {
let mut db = DbMemory::new("agdb_example")?;

// Create two indexes, one for username and one for token. They can just as well
// be craeted later and will index all existing data as well.
// be created later and will index all existing data as well.
db.exec_mut(&QueryBuilder::insert().index("username").query())?;
db.exec_mut(&QueryBuilder::insert().index("token").query())?;

Expand Down