refactor: rename embedded_async_diesel_r2d2 to diesel_embedded

theseus-rs · Aug 19, 2024 · dcd2488 · dcd2488
1 parent df6402e
commit dcd2488
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,6 +28,8 @@ anyhow = "1.0.86"
 async-trait = "0.1.81"
 axum = "0.7.5"
 criterion = "0.5.1"
+diesel = "2.2.1"
+diesel_migrations = "2.2.0"
 flate2 = "1.0.31"
 futures-util = "0.3.30"
 hex = "0.4.3"
@@ -40,6 +42,7 @@ md-5 = "0.10.6"
 num-format = "0.4.4"
 pgvector = "0.4.0"
 quick-xml = "0.36.1"
+r2d2_postgres = "0.18.1"
 rand = "0.8.5"
 regex = "1.10.6"
 reqwest = { version = "0.12.5", default-features = false }

diff --git a/...les/embedded_async_diesel_r2d2/Cargo.toml → examples/diesel_embedded/Cargo.toml b/...les/embedded_async_diesel_r2d2/Cargo.toml → examples/diesel_embedded/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 edition.workspace = true
-name = "embedded_async_diesel_r2d2"
+name = "diesel_embedded"
 publish = false
 license.workspace = true
 version.workspace = true
 
 [dependencies]
+diesel = { workspace = true, features = ["postgres", "r2d2"] }
+diesel_migrations = { workspace = true, features = ["postgres"] }
 postgresql_embedded = { path = "../../postgresql_embedded" }
+r2d2_postgres = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
-diesel = { version = "2.2.1", features = ["postgres", "r2d2"] }
-r2d2_postgres = "0.18.1"
-diesel_migrations = { version = "2.2.0", features = ["postgres"] }
diff --git a/examples/diesel_embedded/README.md b/examples/diesel_embedded/README.md
@@ -0,0 +1,2 @@
+This example is taken from [Getting Started with Diesel](https://diesel.rs/guides/getting-started)
+and modified to work with an embedded database.
diff --git a/...es/embedded_async_diesel_r2d2/diesel.toml → examples/diesel_embedded/diesel.toml b/...es/embedded_async_diesel_r2d2/diesel.toml → examples/diesel_embedded/diesel.toml
diff --git a/...bedded_async_diesel_r2d2/migrations/.keep → examples/diesel_embedded/migrations/.keep b/...bedded_async_diesel_r2d2/migrations/.keep → examples/diesel_embedded/migrations/.keep
diff --git a/examples/diesel_embedded/migrations/2024-08-17-200823_create_posts/down.sql b/examples/diesel_embedded/migrations/2024-08-17-200823_create_posts/down.sql
@@ -0,0 +1 @@
+DROP TABLE posts
diff --git a/examples/diesel_embedded/migrations/2024-08-17-200823_create_posts/up.sql b/examples/diesel_embedded/migrations/2024-08-17-200823_create_posts/up.sql
@@ -0,0 +1,7 @@
+CREATE TABLE posts
+(
+    id        SERIAL PRIMARY KEY,
+    title     VARCHAR NOT NULL,
+    body      TEXT    NOT NULL,
+    published BOOLEAN NOT NULL DEFAULT FALSE
+)
diff --git a/...es/embedded_async_diesel_r2d2/src/main.rs → examples/diesel_embedded/src/main.rs b/...es/embedded_async_diesel_r2d2/src/main.rs → examples/diesel_embedded/src/main.rs
diff --git a/.../embedded_async_diesel_r2d2/src/models.rs → examples/diesel_embedded/src/models.rs b/.../embedded_async_diesel_r2d2/src/models.rs → examples/diesel_embedded/src/models.rs
diff --git a/.../embedded_async_diesel_r2d2/src/schema.rs → examples/diesel_embedded/src/schema.rs b/.../embedded_async_diesel_r2d2/src/schema.rs → examples/diesel_embedded/src/schema.rs
diff --git a/examples/embedded_async_diesel_r2d2/migrations/2024-08-17-200823_create_posts/down.sql b/examples/embedded_async_diesel_r2d2/migrations/2024-08-17-200823_create_posts/down.sql
diff --git a/examples/embedded_async_diesel_r2d2/migrations/2024-08-17-200823_create_posts/up.sql b/examples/embedded_async_diesel_r2d2/migrations/2024-08-17-200823_create_posts/up.sql