thallada/modmapper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix plugins data dump with updated_after parameter

Browse Source 
I was accidentally omitting plugins from the plugins data list when the `updated_after` parameter was used. Splitting it up into two queries makes it much simpler.
This commit is contained in:
Tyler Hallada 2022-08-21 00:16:51 -04:00
parent b80edb49fa
commit 89428da6e0
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/models/plugin.rs
View File

@ -93,6 +93,21 @@ pub async fn batched_get_by_hash_with_mods(
) -> Result<Vec<PluginsByHashWithMods>> { ) -> Result<Vec<PluginsByHashWithMods>> {
let last_hash = last_hash.unwrap_or(-9223372036854775808); // psql bigint min let last_hash = last_hash.unwrap_or(-9223372036854775808); // psql bigint min
if let Some(updated_after) = updated_after { if let Some(updated_after) = updated_after {
let hashes = sqlx::query!(
r#"SELECT
plugins.hash
FROM plugins
WHERE plugins.hash > $2 AND plugins.updated_at > $3
GROUP BY plugins.hash
ORDER BY plugins.hash ASC
LIMIT $1"#,
page_size,
last_hash,
updated_after
)
.fetch_all(pool)
.await
.context("Failed to batch get plugin hashes")?;
sqlx::query_as!( sqlx::query_as!(
PluginsByHashWithMods, PluginsByHashWithMods,
r#"SELECT r#"SELECT
@ -100,21 +115,17 @@ pub async fn batched_get_by_hash_with_mods(
json_agg(DISTINCT plugins.*) as "plugins: Json<Vec<Plugin>>", json_agg(DISTINCT plugins.*) as "plugins: Json<Vec<Plugin>>",
json_agg(DISTINCT files.*) as files, json_agg(DISTINCT files.*) as files,
json_agg(DISTINCT mods.*) as mods, json_agg(DISTINCT mods.*) as mods,
COALESCE(json_agg(DISTINCT jsonb_build_object('x', cells.x, 'y', cells.y)) FILTER (WHERE cells.x IS NOT NULL AND cells.y IS NOT NULL AND cells.master = $3 AND cells.world_id = $4), '[]') AS cells COALESCE(json_agg(DISTINCT jsonb_build_object('x', cells.x, 'y', cells.y)) FILTER (WHERE cells.x IS NOT NULL AND cells.y IS NOT NULL AND cells.master = $2 AND cells.world_id = $3), '[]') AS cells
FROM plugins FROM plugins
LEFT OUTER JOIN files ON files.id = plugins.file_id LEFT OUTER JOIN files ON files.id = plugins.file_id
LEFT OUTER JOIN mods ON mods.id = files.mod_id LEFT OUTER JOIN mods ON mods.id = files.mod_id
LEFT OUTER JOIN plugin_cells ON plugin_cells.plugin_id = plugins.id LEFT OUTER JOIN plugin_cells ON plugin_cells.plugin_id = plugins.id
LEFT OUTER JOIN cells ON cells.id = plugin_cells.cell_id LEFT OUTER JOIN cells ON cells.id = plugin_cells.cell_id
WHERE plugins.hash > $2 AND plugins.updated_at > $5 WHERE plugins.hash = ANY($1::bigint[])
GROUP BY plugins.hash GROUP BY plugins.hash"#,
ORDER BY plugins.hash ASC &hashes.into_iter().map(|h| h.hash).collect::<Vec<i64>>(),
LIMIT $1"#,
page_size,
last_hash,
master, master,
world_id, world_id
updated_after
) )
.fetch_all(pool) .fetch_all(pool)
.await .await