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

chore: update database collab

This commit is contained in:
Zack Fu Zi Xiang 2024-09-12 12:05:20 +08:00
parent 922418b122
commit 3be80aac20
No known key found for this signature in database
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -2092,7 +2092,7 @@ dependencies = [
[[package]]
name = "collab"
version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0340ca880ed108582e7751839c9e9496f00aa5a5#0340ca880ed108582e7751839c9e9496f00aa5a5"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
dependencies = [
"anyhow",
"arc-swap",
@ -2117,7 +2117,7 @@ dependencies = [
[[package]]
name = "collab-database"
version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0340ca880ed108582e7751839c9e9496f00aa5a5#0340ca880ed108582e7751839c9e9496f00aa5a5"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
dependencies = [
"anyhow",
"async-trait",
@ -2148,7 +2148,7 @@ dependencies = [
[[package]]
name = "collab-document"
version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0340ca880ed108582e7751839c9e9496f00aa5a5#0340ca880ed108582e7751839c9e9496f00aa5a5"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
dependencies = [
"anyhow",
"arc-swap",
@ -2168,7 +2168,7 @@ dependencies = [
[[package]]
name = "collab-entity"
version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0340ca880ed108582e7751839c9e9496f00aa5a5#0340ca880ed108582e7751839c9e9496f00aa5a5"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
dependencies = [
"anyhow",
"bytes",
@ -2187,7 +2187,7 @@ dependencies = [
[[package]]
name = "collab-folder"
version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0340ca880ed108582e7751839c9e9496f00aa5a5#0340ca880ed108582e7751839c9e9496f00aa5a5"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
dependencies = [
"anyhow",
"arc-swap",
@ -2272,7 +2272,7 @@ dependencies = [
[[package]]
name = "collab-user"
version = "0.2.0"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=0340ca880ed108582e7751839c9e9496f00aa5a5#0340ca880ed108582e7751839c9e9496f00aa5a5"
source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a4e9dbcf1aa7d1c88be92c854310704a86cac8ea#a4e9dbcf1aa7d1c88be92c854310704a86cac8ea"
dependencies = [
"anyhow",
"collab",

12
Cargo.toml
View File

@ -288,12 +288,12 @@ debug = true
[patch.crates-io]
# It's diffcult to resovle different version with the same crate used in AppFlowy Frontend and the Client-API crate.
# So using patch to workaround this issue.
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0340ca880ed108582e7751839c9e9496f00aa5a5" }
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0340ca880ed108582e7751839c9e9496f00aa5a5" }
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0340ca880ed108582e7751839c9e9496f00aa5a5" }
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0340ca880ed108582e7751839c9e9496f00aa5a5" }
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0340ca880ed108582e7751839c9e9496f00aa5a5" }
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "0340ca880ed108582e7751839c9e9496f00aa5a5" }
collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a4e9dbcf1aa7d1c88be92c854310704a86cac8ea" }
[features]
history = []

2
src/biz/workspace/publish_dup.rs
View File

@ -745,7 +745,7 @@ impl PublishCollabDuplicator {
// assign a new id for the row
let dup_row_id = gen_view_id();
let mut db_row_collab = collab_from_doc_state(row_bin_data.clone(), &dup_row_id)?;
let mut db_row_body = DatabaseRowBody::open(&mut db_row_collab)
let mut db_row_body = DatabaseRowBody::open(dup_row_id.clone().into(), &mut db_row_collab)
.map_err(|e| AppError::Unhandled(e.to_string()))?;
{