-
Notifications
You must be signed in to change notification settings - Fork 8
sqlite support #270
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
JasonShin
wants to merge
5
commits into
main
Choose a base branch
from
sqlite
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
sqlite support #270
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,3 +2,4 @@ pub mod connection; | |
| pub mod execute; | ||
| pub mod mysql; | ||
| pub mod postgres; | ||
| pub mod sqlite; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| pub mod pool; | ||
| pub mod prepare; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| use rusqlite::Connection; | ||
| use std::sync::{Arc, Mutex}; | ||
| use tokio::task; | ||
|
|
||
| /// A connection manager for SQLite that wraps rusqlite's synchronous Connection | ||
| /// behind an Arc<Mutex<>> for thread-safe access with bb8 connection pooling. | ||
| #[derive(Clone, Debug)] | ||
| pub struct SqliteConnectionManager { | ||
| db_path: String, | ||
| connection_name: String, | ||
| } | ||
|
|
||
| /// Wrapper around rusqlite::Connection to make it Send + Sync for bb8 | ||
| pub struct SqliteConnection { | ||
| pub conn: Arc<Mutex<Connection>>, | ||
| } | ||
|
|
||
| // Safety: rusqlite::Connection is not Send by default, but we protect it with Mutex | ||
| // and only access it via spawn_blocking | ||
| unsafe impl Send for SqliteConnection {} | ||
| unsafe impl Sync for SqliteConnection {} | ||
|
|
||
JasonShin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| impl SqliteConnectionManager { | ||
| pub fn new(db_path: String, connection_name: String) -> Self { | ||
| Self { | ||
| db_path, | ||
| connection_name, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug)] | ||
| pub struct SqlitePoolError(pub String); | ||
|
|
||
| impl std::fmt::Display for SqlitePoolError { | ||
| fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
| write!(f, "SQLite pool error: {}", self.0) | ||
| } | ||
| } | ||
|
|
||
| impl std::error::Error for SqlitePoolError {} | ||
|
|
||
| impl bb8::ManageConnection for SqliteConnectionManager { | ||
| type Connection = SqliteConnection; | ||
| type Error = SqlitePoolError; | ||
|
|
||
| async fn connect(&self) -> Result<Self::Connection, Self::Error> { | ||
| let db_path = self.db_path.clone(); | ||
| let connection_name = self.connection_name.clone(); | ||
|
|
||
| let conn = task::spawn_blocking(move || { | ||
| Connection::open(&db_path).unwrap_or_else(|err| { | ||
| panic!( | ||
| "Failed to open SQLite database at '{}' for connection '{}': {}", | ||
| db_path, connection_name, err | ||
| ) | ||
| }) | ||
| }) | ||
| .await | ||
| .map_err(|e| SqlitePoolError(format!("Failed to spawn blocking task: {e}")))?; | ||
|
|
||
JasonShin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Ok(SqliteConnection { | ||
| conn: Arc::new(Mutex::new(conn)), | ||
| }) | ||
| } | ||
|
|
||
| async fn is_valid(&self, conn: &mut Self::Connection) -> Result<(), Self::Error> { | ||
| let inner = conn.conn.clone(); | ||
| task::spawn_blocking(move || { | ||
| let conn = inner.lock().unwrap(); | ||
| conn | ||
| .execute_batch("SELECT 1") | ||
| .map_err(|e| SqlitePoolError(format!("SQLite connection validation failed: {e}"))) | ||
| }) | ||
| .await | ||
| .map_err(|e| SqlitePoolError(format!("Failed to spawn blocking task: {e}")))? | ||
| } | ||
|
|
||
| fn has_broken(&self, _conn: &mut Self::Connection) -> bool { | ||
| false | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.