From 5c8ffe961e2fecba44b730a233f6b2a8bdc81499 Mon Sep 17 00:00:00 2001 From: Geometrically <18202329+Geometrically@users.noreply.github.com> Date: Fri, 16 Oct 2020 11:21:07 -0700 Subject: [PATCH] Fix local indexing (#78) --- sqlx-data.json | 27 +++++++++++++++++++++++++++ src/search/indexing/local_import.rs | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/sqlx-data.json b/sqlx-data.json index 8151ba2ee..55a711489 100644 --- a/sqlx-data.json +++ b/sqlx-data.json @@ -59,6 +59,33 @@ "nullable": [] } }, + "0da158263c6588a83421154342db2ede16b9abf9931827790b9fcaf71080c324": { + "query": "\n SELECT u.id, u.username FROM users u\n INNER JOIN team_members tm ON tm.user_id = u.id\n WHERE tm.team_id = $2 AND tm.role = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int8" + }, + { + "ordinal": 1, + "name": "username", + "type_info": "Varchar" + } + ], + "parameters": { + "Left": [ + "Text", + "Int8" + ] + }, + "nullable": [ + false, + false + ] + } + }, "1016a0bf55e9474357ac5ef725605ac337e82e1a2b93726ae795ec48f0d696dd": { "query": "\n SELECT v.mod_id, v.author_id, v.name, v.version_number,\n v.changelog_url, v.date_published, v.downloads,\n release_channels.channel\n FROM versions v\n INNER JOIN release_channels ON v.release_channel = release_channels.id\n WHERE v.id = $1\n ", "describe": { diff --git a/src/search/indexing/local_import.rs b/src/search/indexing/local_import.rs index ae16c1d5d..1017d3546 100644 --- a/src/search/indexing/local_import.rs +++ b/src/search/indexing/local_import.rs @@ -67,8 +67,8 @@ pub async fn index_local(pool: PgPool) -> Result, IndexingE let user = sqlx::query!( " SELECT u.id, u.username FROM users u - INNER JOIN team_members tm ON tm.role = $1 - WHERE tm.team_id = $2 + INNER JOIN team_members tm ON tm.user_id = u.id + WHERE tm.team_id = $2 AND tm.role = $1 ", crate::models::teams::OWNER_ROLE, mod_data.team_id,