chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1141 from AppFlowy-IO/select-most-recent-non-original-workspace 

fix: select most recent non original namespace
This commit is contained in:
Khor Shu Heng 2025-01-09 10:26:38 +08:00 committed by GitHub
parent f380c34460 6d09fbb236
commit bb08655977
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.sqlx/query-f3e9184f6ebb4df77159031701474847dcfa914ceae602c6554ed93162783ee8.json → .sqlx/query-2d6d00669ea7d598d69d848d143f33e8c144d35b3d4c5293f98344b2c62fe6c8.json
View File

@ -1,6 +1,6 @@
{ {
"db_name": "PostgreSQL", "db_name": "PostgreSQL",
"query": "\n SELECT namespace\n FROM af_workspace_namespace\n WHERE workspace_id = (SELECT workspace_id FROM af_workspace_namespace WHERE namespace = $1)\n AND is_original = FALSE\n ORDER BY created_at ASC\n LIMIT 1\n ", "query": "\n SELECT namespace\n FROM af_workspace_namespace\n WHERE workspace_id = (SELECT workspace_id FROM af_workspace_namespace WHERE namespace = $1)\n AND is_original = FALSE\n ORDER BY created_at DESC\n LIMIT 1\n ",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@ -18,5 +18,5 @@
false false
] ]
}, },
"hash": "f3e9184f6ebb4df77159031701474847dcfa914ceae602c6554ed93162783ee8" "hash": "2d6d00669ea7d598d69d848d143f33e8c144d35b3d4c5293f98344b2c62fe6c8"
} }

8
libs/database/src/publish.rs
View File

@ -525,7 +525,7 @@ pub async fn select_default_published_view_id<'a, E: Executor<'a, Database = Pos
Ok(res) Ok(res)
} }
async fn select_first_non_original_namespace( async fn select_most_recent_non_original_namespace(
pg_pool: &PgPool, pg_pool: &PgPool,
namespace: &str, namespace: &str,
) -> Result<Option<String>, AppError> { ) -> Result<Option<String>, AppError> {
@ -535,7 +535,7 @@ async fn select_first_non_original_namespace(
FROM af_workspace_namespace FROM af_workspace_namespace
WHERE workspace_id = (SELECT workspace_id FROM af_workspace_namespace WHERE namespace = $1) WHERE workspace_id = (SELECT workspace_id FROM af_workspace_namespace WHERE namespace = $1)
AND is_original = FALSE AND is_original = FALSE
ORDER BY created_at ASC ORDER BY created_at DESC
LIMIT 1 LIMIT 1
"#, "#,
namespace, namespace,
@ -575,7 +575,7 @@ pub async fn select_publish_info_for_view_ids(
return Ok(res); return Ok(res);
} }
if let Some(non_original_namespace) = if let Some(non_original_namespace) =
select_first_non_original_namespace(pg_pool, &res[0].namespace).await? select_most_recent_non_original_namespace(pg_pool, &res[0].namespace).await?
{ {
res.iter_mut().for_each(|info| { res.iter_mut().for_each(|info| {
info.namespace.clone_from(&non_original_namespace); info.namespace.clone_from(&non_original_namespace);
@ -633,7 +633,7 @@ async fn use_non_orginal_namespace_if_possible(
} }
if let Some(non_original_namespace) = if let Some(non_original_namespace) =
select_first_non_original_namespace(pg_pool, &publish_infos[0].namespace).await? select_most_recent_non_original_namespace(pg_pool, &publish_infos[0].namespace).await?
{ {
publish_infos.iter_mut().for_each(|info| { publish_infos.iter_mut().for_each(|info| {
info.namespace.clone_from(&non_original_namespace); info.namespace.clone_from(&non_original_namespace);