[PR #4197] [MERGED] Update Diesel to 2.1.x #6120

New issue

Closed

opened 2026-03-23 22:21:48 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 22:21:48 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/4197
Author: @Jiraffe7
Created: 12/22/2023
Status: ✅ Merged
Merged: 12/23/2023
Merged by: @appflowy

Base: main ← Head: update-diesel2

📝 Commits (3)

b778fed chore: update diesel to 2.1.x
15071e8 Merge branch 'main' into update-diesel2
fb494ef chore: commit tauri cargo lock file

📊 Changes

20 files changed (+218 additions, -122 deletions)

View changed files

📝 frontend/appflowy_tauri/src-tauri/Cargo.lock (+26 -14)
📝 frontend/appflowy_tauri/src-tauri/Cargo.toml (+1 -1)
📝 frontend/rust-lib/Cargo.lock (+80 -16)
📝 frontend/rust-lib/Cargo.toml (+1 -1)
📝 frontend/rust-lib/flowy-core/src/deps_resolve/collab_backup.rs (+7 -7)
📝 frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rs (+13 -10)
📝 frontend/rust-lib/flowy-sqlite/Cargo.toml (+4 -4)
📝 frontend/rust-lib/flowy-sqlite/src/kv/kv.rs (+11 -11)
📝 frontend/rust-lib/flowy-sqlite/src/lib.rs (+6 -3)
📝 frontend/rust-lib/flowy-sqlite/src/sqlite_impl/conn_ext.rs (+11 -8)
📝 frontend/rust-lib/flowy-sqlite/src/sqlite_impl/errors.rs (+1 -1)
📝 frontend/rust-lib/flowy-sqlite/src/sqlite_impl/pool.rs (+2 -2)
📝 frontend/rust-lib/flowy-sqlite/src/sqlite_impl/pragma.rs (+24 -13)
📝 frontend/rust-lib/flowy-user/Cargo.toml (+1 -1)
📝 frontend/rust-lib/flowy-user/src/manager.rs (+8 -8)
📝 frontend/rust-lib/flowy-user/src/migrations/migration.rs (+7 -7)
📝 frontend/rust-lib/flowy-user/src/services/db.rs (+4 -4)
📝 frontend/rust-lib/flowy-user/src/services/user_sql.rs (+2 -2)
📝 frontend/rust-lib/flowy-user/src/services/user_workspace.rs (+8 -8)
📝 frontend/rust-lib/flowy-user/src/services/workspace_sql.rs (+1 -1)

📄 Description

Feature Preview

This PR updates the Diesel version to 2.1.x and makes changes according to the migration guide

PR Checklist

My code adheres to AppFlowy's Conventions
I've listed at least one issue that this PR fixes in the description above.
I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
All existing tests are passing.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/4197 **Author:** [@Jiraffe7](https://github.com/Jiraffe7) **Created:** 12/22/2023 **Status:** ✅ Merged **Merged:** 12/23/2023 **Merged by:** [@appflowy](https://github.com/appflowy) **Base:** `main` ← **Head:** `update-diesel2` --- ### 📝 Commits (3) - [`b778fed`](https://github.com/AppFlowy-IO/AppFlowy/commit/b778fed74fc09189a2ffefebe9f4f12b826f16cf) chore: update diesel to 2.1.x - [`15071e8`](https://github.com/AppFlowy-IO/AppFlowy/commit/15071e81321d4c4f3d76bc049e93da80b1ef71e3) Merge branch 'main' into update-diesel2 - [`fb494ef`](https://github.com/AppFlowy-IO/AppFlowy/commit/fb494ef55f53fee6b6031abf9421b14b21dda414) chore: commit tauri cargo lock file ### 📊 Changes **20 files changed** (+218 additions, -122 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_tauri/src-tauri/Cargo.lock` (+26 -14) 📝 `frontend/appflowy_tauri/src-tauri/Cargo.toml` (+1 -1) 📝 `frontend/rust-lib/Cargo.lock` (+80 -16) 📝 `frontend/rust-lib/Cargo.toml` (+1 -1) 📝 `frontend/rust-lib/flowy-core/src/deps_resolve/collab_backup.rs` (+7 -7) 📝 `frontend/rust-lib/flowy-core/src/deps_resolve/collab_deps.rs` (+13 -10) 📝 `frontend/rust-lib/flowy-sqlite/Cargo.toml` (+4 -4) 📝 `frontend/rust-lib/flowy-sqlite/src/kv/kv.rs` (+11 -11) 📝 `frontend/rust-lib/flowy-sqlite/src/lib.rs` (+6 -3) 📝 `frontend/rust-lib/flowy-sqlite/src/sqlite_impl/conn_ext.rs` (+11 -8) 📝 `frontend/rust-lib/flowy-sqlite/src/sqlite_impl/errors.rs` (+1 -1) 📝 `frontend/rust-lib/flowy-sqlite/src/sqlite_impl/pool.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-sqlite/src/sqlite_impl/pragma.rs` (+24 -13) 📝 `frontend/rust-lib/flowy-user/Cargo.toml` (+1 -1) 📝 `frontend/rust-lib/flowy-user/src/manager.rs` (+8 -8) 📝 `frontend/rust-lib/flowy-user/src/migrations/migration.rs` (+7 -7) 📝 `frontend/rust-lib/flowy-user/src/services/db.rs` (+4 -4) 📝 `frontend/rust-lib/flowy-user/src/services/user_sql.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-user/src/services/user_workspace.rs` (+8 -8) 📝 `frontend/rust-lib/flowy-user/src/services/workspace_sql.rs` (+1 -1) </details> ### 📄 Description   ### Feature Preview This PR updates the Diesel version to 2.1.x and makes changes according to the [migration guide](https://diesel.rs/guides/migration_guide.html)  ---  #### PR Checklist - [x] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [x] I've listed at least one issue that this PR fixes in the description above. - [x] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [x] All existing tests are passing. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>