Merge main into sweep/add-sweep-config

ensemble/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ensemble"
-version = "0.0.3"
+version = "0.0.4"
 readme = { workspace = true }
 edition = { workspace = true }
 authors = { workspace = true }

ensemble/src/query.rs

@@ -572,9 +572,17 @@ pub struct Columns(Vec<(String, Value)>);
 
 impl Columns {
 	fn escape(column: &str) -> String {
+		let parts = column.split('.');
+
 		match connection::which_db() {
-			Database::MySQL => format!("`{column}`"),
-			Database::PostgreSQL => format!("\"{column}\""),
+			Database::MySQL => parts
+				.map(|part| format!("`{part}`"))
+				.collect::<Vec<String>>()
+				.join("."),
+			Database::PostgreSQL => parts
+				.map(|part| format!("\"{part}\""))
+				.collect::<Vec<String>>()
+				.join("."),
 		}
 	}
 }

ensemble/src/types/datetime.rs

@@ -1,4 +1,3 @@
-use fastdate::Date;
 use rbs::Value;
 use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
 use std::{

examples/relationships/src/main.rs

@@ -1,46 +1,46 @@
 use std::env;
 
 use ensemble::{
-    relationships::{BelongsTo, HasMany, Relationship},
-    types::{DateTime, Hashed},
-    Model,
+	relationships::{BelongsTo, HasMany, Relationship},
+	types::{DateTime, Hashed},
+	Model,
 };
 
 #[derive(Debug, Model)]
 pub struct User {
-    pub id: u64,
-    pub name: String,
-    pub email: String,
-    pub password: Hashed<String>,
-    pub created_at: DateTime,
-    pub updated_at: DateTime,
-    #[model(foreign_key = "author_id")]
-    pub posts: HasMany<User, Post>,
+	pub id: u64,
+	pub name: String,
+	pub email: String,
+	pub password: Hashed<String>,
+	pub created_at: DateTime,
+	pub updated_at: DateTime,
+	// #[model(foreign_key = "author_id")]
+	pub posts: HasMany<User, Post>,
 }
 
 #[derive(Debug, Model)]
 pub struct Post {
-    #[model(incrementing)]
-    pub id: u64,
-    pub title: String,
-    pub content: String,
-    pub created_at: DateTime,
-    pub updated_at: DateTime,
+	#[model(incrementing)]
+	pub id: u64,
+	pub title: String,
+	pub content: String,
+	pub created_at: DateTime,
+	pub updated_at: DateTime,
 
-    #[model(foreign_key = "author_id")]
-    pub user: BelongsTo<Post, User>,
+	// #[model(foreign_key = "author_id")]
+	pub user: BelongsTo<Post, User>,
 }
 
 #[tokio::main]
 async fn main() {
-    ensemble::setup(&env::var("DATABASE_URL").expect("DATABASE_URL must be set"))
-        .expect("Failed to set up database pool.");
+	ensemble::setup(&env::var("DATABASE_URL").expect("DATABASE_URL must be set"))
+		.expect("Failed to set up database pool.");
 
-    let mut user = User::find(1).await.expect("Failed to find user.");
-    let posts = user.posts.get().await.expect("Failed to get posts.");
-    dbg!(posts);
+	let mut user = User::find(1).await.expect("Failed to find user.");
+	let posts = user.posts.get().await.expect("Failed to get posts.");
+	dbg!(posts);
 
-    let mut post = Post::find(1).await.expect("Failed to find post.");
-    let user = post.user.get().await.expect("Failed to get user.");
-    dbg!(user);
+	let mut post = Post::find(1).await.expect("Failed to find post.");
+	let user = post.user.get().await.expect("Failed to get user.");
+	dbg!(user);
 }