not working: partial implementation of query map codegen
parent
4569955663
commit
62c8eae231
@ -0,0 +1,13 @@
|
||||
[package]
|
||||
name = "sqly"
|
||||
version = "0.0.1"
|
||||
edition = "2021"
|
||||
|
||||
[lib]
|
||||
proc-macro = true
|
||||
|
||||
[dependencies]
|
||||
proc-macro2 = "1.0.78"
|
||||
quote = "1.0.35"
|
||||
syn = "2.0.51"
|
||||
|
||||
@ -0,0 +1,2 @@
|
||||
[toolchain]
|
||||
channel = "nightly"
|
||||
@ -0,0 +1,192 @@
|
||||
use quote::quote;
|
||||
use syn::parse::{Parse, ParseStream};
|
||||
use syn::punctuated::Punctuated;
|
||||
use syn::{bracketed, parse_macro_input, Expr, Ident, LitStr, Result, Token};
|
||||
|
||||
extern crate proc_macro;
|
||||
|
||||
#[proc_macro]
|
||||
pub fn query_parsed(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
|
||||
let macro_params = parse_macro_input!(input as QueryChecked);
|
||||
let connection = macro_params.connection;
|
||||
let query = macro_params.query;
|
||||
let params = macro_params.params;
|
||||
let return_type = macro_params.return_type;
|
||||
|
||||
let query = quote! {
|
||||
let rows = sqlx::query!(#query, #params)
|
||||
.fetch_all(#connection)
|
||||
.await?.iter()
|
||||
};
|
||||
|
||||
let parse = generate_parse_value(&return_type);
|
||||
|
||||
let result = quote! {
|
||||
{
|
||||
#query;
|
||||
#parse
|
||||
}
|
||||
};
|
||||
|
||||
proc_macro::TokenStream::from(result)
|
||||
}
|
||||
|
||||
fn generate_parse_value(value: &TypeMapping) -> proc_macro2::TokenStream {
|
||||
match value.clone() {
|
||||
TypeMapping::Column(name) => generate_parse_column(name),
|
||||
TypeMapping::Vec(mapping) => generate_parse_vec(mapping),
|
||||
TypeMapping::Object {
|
||||
struct_name,
|
||||
properties,
|
||||
} => generate_parse_object(struct_name, properties),
|
||||
}
|
||||
}
|
||||
|
||||
fn generate_parse_column(column: Ident) -> proc_macro2::TokenStream {
|
||||
quote! {
|
||||
rows[0].#column
|
||||
}
|
||||
}
|
||||
|
||||
fn generate_parse_object(
|
||||
struct_name: Ident,
|
||||
properties: Vec<TypeProperty>,
|
||||
) -> proc_macro2::TokenStream {
|
||||
let property_lines =
|
||||
properties
|
||||
.iter()
|
||||
.map(|property: &TypeProperty| -> proc_macro2::TokenStream {
|
||||
let name = &property.name;
|
||||
let value = generate_parse_value(&property.mapping);
|
||||
quote! {
|
||||
#name: #value
|
||||
}
|
||||
});
|
||||
|
||||
quote! {
|
||||
#struct_name {
|
||||
#( #property_lines ),*
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn generate_parse_vec(inner_type: Box<TypeMapping>) -> proc_macro2::TokenStream {
|
||||
let value_expression = generate_parse_value(&*inner_type);
|
||||
|
||||
quote! {
|
||||
{
|
||||
let vec = Vec::new();
|
||||
let optional_value = #value_expression;
|
||||
|
||||
if optional_value.is_some() {
|
||||
vec.push(#value_expression);
|
||||
}
|
||||
vec
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
struct QueryChecked {
|
||||
connection: Expr,
|
||||
query: LitStr,
|
||||
params: Punctuated<Expr, Token![,]>,
|
||||
return_type: TypeMapping,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
enum TypeMapping {
|
||||
Column(Ident),
|
||||
Vec(Box<TypeMapping>),
|
||||
Object {
|
||||
struct_name: Ident,
|
||||
properties: Vec<TypeProperty>,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
struct TypeProperty {
|
||||
name: Ident,
|
||||
mapping: TypeMapping,
|
||||
}
|
||||
|
||||
impl Parse for QueryChecked {
|
||||
fn parse(input: ParseStream) -> Result<Self> {
|
||||
let mut connection: Option<Expr> = None;
|
||||
let mut query: Option<LitStr> = None;
|
||||
let mut params: Option<Punctuated<Expr, Token![,]>> = None;
|
||||
let mut return_type: Option<TypeMapping> = None;
|
||||
|
||||
while !input.is_empty() {
|
||||
let identifier = input.parse::<syn::Ident>()?;
|
||||
input.parse::<Token![=]>()?;
|
||||
|
||||
match identifier.to_string().as_str() {
|
||||
"connection" => connection = Some(input.parse()?),
|
||||
"query" => query = Some(input.parse()?),
|
||||
"params" => {
|
||||
let content;
|
||||
bracketed!(content in input);
|
||||
|
||||
params = Some(Punctuated::parse_terminated(&content)?)
|
||||
}
|
||||
"return_type" => return_type = Some(input.parse()?),
|
||||
unknown => {
|
||||
return Err(input.error(format!("Unknown property {}", unknown)));
|
||||
}
|
||||
}
|
||||
|
||||
if !input.is_empty() {
|
||||
input.parse::<Token![,]>()?;
|
||||
}
|
||||
}
|
||||
|
||||
Ok(QueryChecked {
|
||||
connection: connection.ok_or(input.error("Expected connection property"))?,
|
||||
query: query.ok_or(input.error("Expected query property"))?,
|
||||
params: params.unwrap_or(Punctuated::new()),
|
||||
return_type: return_type.ok_or(input.error("Expected return type property"))?,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl Parse for TypeMapping {
|
||||
fn parse(input: ParseStream) -> Result<Self> {
|
||||
let identifier = input.parse::<syn::Ident>()?;
|
||||
|
||||
if !input.is_empty() && input.peek(Token![<]) && identifier.to_string() == "Vec" {
|
||||
input.parse::<Token![<]>()?;
|
||||
let internal: TypeMapping = input.parse()?;
|
||||
input.parse::<Token![>]>()?;
|
||||
|
||||
Ok(TypeMapping::Vec(Box::new(internal)))
|
||||
} else if !input.is_empty() && input.peek(syn::token::Brace) {
|
||||
let internal;
|
||||
syn::braced!(internal in input);
|
||||
|
||||
let properties: Punctuated<TypeProperty, Token![,]> =
|
||||
Punctuated::parse_terminated(&internal)?;
|
||||
|
||||
let properties = properties.iter().map(|p| p.clone()).collect();
|
||||
|
||||
Ok(TypeMapping::Object {
|
||||
struct_name: identifier,
|
||||
properties,
|
||||
})
|
||||
} else {
|
||||
Ok(TypeMapping::Column(identifier))
|
||||
}
|
||||
}
|
||||
}
|
||||
impl Parse for TypeProperty {
|
||||
fn parse(input: ParseStream) -> Result<Self> {
|
||||
let identifier = input.parse::<syn::Ident>()?;
|
||||
input.parse::<Token![:]>()?;
|
||||
let property_type: TypeMapping = input.parse()?;
|
||||
|
||||
Ok(TypeProperty {
|
||||
name: identifier,
|
||||
mapping: property_type,
|
||||
})
|
||||
}
|
||||
}
|
||||
@ -1,180 +0,0 @@
|
||||
use serde::Serialize;
|
||||
use sqlx::{Pool, Postgres};
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct DB {
|
||||
connection_pool: Pool::<Postgres>
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct Site {
|
||||
uuid: Uuid,
|
||||
title: String,
|
||||
base_url: String,
|
||||
theme: String,
|
||||
boards: Vec<Board>
|
||||
}
|
||||
|
||||
#[derive(Serialize, Clone)]
|
||||
pub struct Board {
|
||||
uuid: Uuid,
|
||||
title: String,
|
||||
description: String,
|
||||
threads: Vec<Thread>
|
||||
}
|
||||
impl Board {
|
||||
fn clone(&self) -> Board {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Clone)]
|
||||
pub struct Thread {
|
||||
uuid: Uuid,
|
||||
title: String,
|
||||
posts: Vec<Post>
|
||||
}
|
||||
|
||||
#[derive(Serialize, Clone)]
|
||||
pub struct Post {
|
||||
uuid: Uuid,
|
||||
contents: String,
|
||||
author: User
|
||||
}
|
||||
|
||||
#[derive(Serialize, Clone)]
|
||||
pub struct User {
|
||||
uuid: Uuid,
|
||||
email: String,
|
||||
username: String,
|
||||
password_hash: String,
|
||||
is_admin: bool
|
||||
}
|
||||
|
||||
impl DB {
|
||||
pub async fn init() -> Self {
|
||||
let db_url = std::env::var("DATABASE_URL").expect("Please provide DATABASE_URL in environment");
|
||||
let pool = Pool::<Postgres>::connect(db_url.as_str()).await.expect("Could not connect to database");
|
||||
|
||||
sqlx::migrate!()
|
||||
.run(&pool)
|
||||
.await
|
||||
.expect("Could not run database migrations");
|
||||
|
||||
DB {
|
||||
connection_pool: pool
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_site_data(&self) -> Result<Site, String> {
|
||||
let rows = sqlx::query!(r#"
|
||||
select
|
||||
site_uuid,
|
||||
site_title,
|
||||
site_base_url,
|
||||
site_theme,
|
||||
board_uuid,
|
||||
board_title,
|
||||
board_description,
|
||||
thread_uuid,
|
||||
thread_title,
|
||||
post_uuid as "post_uuid?",
|
||||
post_contents as "post_contents?",
|
||||
user_uuid,
|
||||
user_email,
|
||||
user_username,
|
||||
user_password_hash,
|
||||
user_is_admin
|
||||
from forum.site
|
||||
left join forum.board on board_site = site_uuid
|
||||
left join forum.thread on thread_board = board_uuid
|
||||
left join forum.post on post_thread = thread_uuid
|
||||
left join forum.user on post_author = user_uuid
|
||||
"#).fetch_all(&self.connection_pool).await.expect("Could not connect to database");
|
||||
|
||||
let mut site : Option<Site> = None;
|
||||
let mut last_board : Option<Board> = None;
|
||||
let mut last_thread : Option<Thread> = None;
|
||||
let mut last_post : Option<Post> = None;
|
||||
|
||||
for row in rows {
|
||||
if site.is_none() || row.site_uuid.is_some() && row.site_uuid.unwrap() != site.as_ref().unwrap().uuid {
|
||||
site = Some(Site {
|
||||
uuid: row.site_uuid.unwrap(),
|
||||
title: row.site_title.unwrap_or(String::new()),
|
||||
base_url: row.site_base_url.unwrap_or(String::new()),
|
||||
theme: row.site_theme.unwrap_or(String::new()),
|
||||
boards: Vec::new()
|
||||
})
|
||||
}
|
||||
|
||||
if last_board.is_none() || row.board_uuid.is_some() && row.board_uuid.unwrap() != last_board.as_ref().unwrap().uuid {
|
||||
if let Some(ref board) = last_board {
|
||||
site.as_mut().unwrap().boards.push(board.clone())
|
||||
}
|
||||
|
||||
if row.board_uuid.is_some() {
|
||||
last_board = Some(Board {
|
||||
uuid: row.board_uuid.unwrap(),
|
||||
title: row.board_title.unwrap_or(String::new()),
|
||||
description: row.board_description.unwrap_or(String::new()),
|
||||
threads: Vec::new()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if last_thread.is_none() || row.thread_uuid.is_some() && row.thread_uuid.unwrap() != last_thread.as_mut().unwrap().uuid {
|
||||
if let Some(ref thread) = last_thread {
|
||||
last_board.as_mut().unwrap().threads.push(thread.clone())
|
||||
}
|
||||
|
||||
if row.thread_uuid.is_some() {
|
||||
last_thread = Some(Thread {
|
||||
uuid: row.thread_uuid.unwrap(),
|
||||
title: row.thread_title.unwrap_or(String::new()),
|
||||
posts: Vec::new()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if last_post.is_none() || row.post_uuid.is_some() && row.post_uuid.unwrap() != last_post.as_ref().unwrap().uuid {
|
||||
if let Some(ref post) = last_post {
|
||||
last_thread.as_mut().unwrap().posts.push(post.clone())
|
||||
}
|
||||
|
||||
if row.post_uuid.is_some() {
|
||||
last_post = Some(Post {
|
||||
uuid: row.post_uuid.unwrap(),
|
||||
contents: row.post_contents.unwrap_or(String::new()),
|
||||
author: User {
|
||||
uuid: row.user_uuid.unwrap(),
|
||||
email: row.user_email.unwrap_or(String::new()),
|
||||
username: row.user_username.unwrap_or(String::new()),
|
||||
password_hash: row.user_password_hash.unwrap_or(String::new()),
|
||||
is_admin: row.user_is_admin.unwrap_or(false)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if last_post.is_some() {
|
||||
last_thread.as_mut().unwrap().posts.push(last_post.unwrap());
|
||||
}
|
||||
|
||||
if last_thread.is_some() {
|
||||
last_board.as_mut().unwrap().threads.push(last_thread.unwrap());
|
||||
}
|
||||
|
||||
if last_board.is_some() {
|
||||
site.as_mut().unwrap().boards.push(last_board.unwrap());
|
||||
}
|
||||
|
||||
if let Some(site) = site {
|
||||
Ok(site)
|
||||
} else {
|
||||
Err("Could not find site in DB".to_string())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
use sqlx::{Pool, Postgres};
|
||||
|
||||
pub mod objects;
|
||||
use objects::{Board, Post, Site, Thread, User};
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct DB {
|
||||
connection_pool: Pool<Postgres>,
|
||||
}
|
||||
|
||||
impl DB {
|
||||
pub async fn init() -> Self {
|
||||
let db_url =
|
||||
std::env::var("DATABASE_URL").expect("Please provide DATABASE_URL in environment");
|
||||
let pool = Pool::<Postgres>::connect(db_url.as_str())
|
||||
.await
|
||||
.expect("Could not connect to database");
|
||||
|
||||
sqlx::migrate!()
|
||||
.run(&pool)
|
||||
.await
|
||||
.expect("Could not run database migrations");
|
||||
|
||||
DB {
|
||||
connection_pool: pool,
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_site_data(&self) -> Result<Site, String> {
|
||||
let site = sqly::query_parsed!(
|
||||
connection = &self.connection_pool,
|
||||
query = r#"
|
||||
select * from forum.site
|
||||
left join forum.board on board_site = site_uuid
|
||||
left join forum.thread on thread_board = board_uuid
|
||||
left join forum.post on post_thread = thread_uuid
|
||||
left join forum.user on post_author = user_uuid
|
||||
"#,
|
||||
// return_type = board_uuid
|
||||
return_type = Site {
|
||||
uuid: site_uuid,
|
||||
title: site_title,
|
||||
base_url: site_base_url,
|
||||
theme: site_theme,
|
||||
boards: Vec<Board {
|
||||
uuid: board_uuid,
|
||||
title: board_title,
|
||||
description: board_description,
|
||||
threads: Vec<Thread {
|
||||
uuid: thread_uuid,
|
||||
title: thread_title,
|
||||
posts: Vec<Post {
|
||||
uuid: post_uuid,
|
||||
contents: post_contents,
|
||||
author: User {
|
||||
uuid: user_uuid,
|
||||
username: user_username,
|
||||
email: user_email,
|
||||
password_hash: user_password_hash,
|
||||
is_admin: user_is_admin
|
||||
}
|
||||
}>
|
||||
}>
|
||||
}>
|
||||
}
|
||||
);
|
||||
|
||||
if let Some(site) = site {
|
||||
Ok(site)
|
||||
} else {
|
||||
Err("Could not find site in DB".to_string())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
use serde::Serialize;
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Serialize, Clone)]
|
||||
pub struct Site {
|
||||
pub uuid: Uuid,
|
||||
pub title: String,
|
||||
pub base_url: String,
|
||||
pub theme: String,
|
||||
pub boards: Vec<Board>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Clone)]
|
||||
pub struct Board {
|
||||
pub uuid: Uuid,
|
||||
pub title: String,
|
||||
pub description: String,
|
||||
pub threads: Vec<Thread>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Clone)]
|
||||
pub struct Thread {
|
||||
pub uuid: Uuid,
|
||||
pub title: String,
|
||||
pub posts: Vec<Post>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Clone)]
|
||||
pub struct Post {
|
||||
pub uuid: Uuid,
|
||||
pub contents: String,
|
||||
pub author: User,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Clone)]
|
||||
pub struct User {
|
||||
pub uuid: Uuid,
|
||||
pub email: String,
|
||||
pub username: String,
|
||||
pub password_hash: String,
|
||||
pub is_admin: bool,
|
||||
}
|
||||
Loading…
Reference in New Issue