commit working version post refactor

Author: technetos

examples/hello_database/src/main.rs

@@ -7,7 +7,7 @@ extern crate diesel as other_diesel;
 extern crate serde_derive;
 
 use diesel::{
-    self, insert_into, prelude::*, result::Error, update, Associations, FromSqlRow, Identifiable,
+    self, delete, insert_into, prelude::*, result::Error, update, Associations, FromSqlRow, Identifiable,
     Insertable, Queryable,
 };
 use postgres_resource::*;
@@ -16,6 +16,7 @@ use crate::schema::worlds;
 mod schema;
 
 #[resource]
+#[table = "worlds"]
 struct World {
     uuid: Uuid,
     name: String,

postgres_resource_derive/src/attr.rs

@@ -41,12 +41,12 @@ impl Attrs {
     fn parse_attr(attr: &Attribute, expected: &str) -> Result<Option<LitStr>> {
         match attr.parse_meta()? {
             NameValue(MetaNameValue { lit: Lit::Str(lit_str), .. }) => {
-                lit_str.parse().map(Some)
+                Ok(Some(lit_str))
             }
             _ => {
                 let error_span = attr.bracket_token.span;
                 let message = &format!("expected #[{} = \"...\"]", expected);
-                Err(syn::Error::new(error_span, message))
+                Err(Error::new(error_span, message))
             }
         }
     }

postgres_resource_derive/src/builder.rs

@@ -1,4 +1,4 @@
-use crate::{attr::*, IdentExt, camel_to_snake, r#struct::*};
+use crate::{attr::*, IdentExt, camel_to_snake, r#struct::*, AsSnake};
 
 use proc_macro2::Span;
 use syn::{
@@ -7,6 +7,7 @@ use syn::{
     token, Attribute, Ident, LitStr,
     Meta::*,
     MetaNameValue,
+    Index,
 };
 
 pub struct Input {
@@ -35,12 +36,12 @@ impl<'i, B: Builder<'i>> Builder<'i> for CustomTableMacro<B> {
     }
 }
 
-pub struct ModelWithId<B>(pub B);
+pub struct ModelWithId;
 
-impl<'i, B: Builder<'i>> Builder<'i> for ModelWithId<B> {
+impl<'i> Builder<'i> for ModelWithId {
     fn build(self, input: &'i Input) -> Result<proc_macro2::TokenStream> {
         let model_name_with_id = input.parsed_struct.ident.append("WithId");
-        let fields = self.0.build(input)?;
+        let fields = ModelWithIdFields.build(input)?;
 
         Ok(quote! {
             pub struct #model_name_with_id {
@@ -50,9 +51,9 @@ impl<'i, B: Builder<'i>> Builder<'i> for ModelWithId<B> {
     }
 }
 
-pub struct Fields;
+pub struct ModelWithIdFields;
 
-impl<'i> Builder<'i> for Fields {
+impl<'i> Builder<'i> for ModelWithIdFields {
     fn build(self, input: &'i Input) -> Result<proc_macro2::TokenStream> {
         let mut fields = Vec::new();
         fields.push(quote!(pub id: i32));
@@ -72,12 +73,12 @@ impl<'i> Builder<'i> for Fields {
     }
 }
 
-pub struct Model<B>(pub B);
+pub struct Model;
 
-impl<'i, B: Builder<'i>> Builder<'i> for Model<B> {
+impl<'i> Builder<'i> for Model {
     fn build(self, input: &'i Input) -> Result<proc_macro2::TokenStream> {
         let model_name = &input.parsed_struct.ident;
-        let fields = self.0.build(input)?;
+        let fields = ModelFields.build(input)?;
 
         Ok(quote! {
             pub struct #model_name {
@@ -87,9 +88,9 @@ impl<'i, B: Builder<'i>> Builder<'i> for Model<B> {
     }
 }
 
-pub struct InnerFields;
+pub struct ModelFields;
 
-impl<'i> Builder<'i> for InnerFields {
+impl<'i> Builder<'i> for ModelFields {
     fn build(self, input: &'i Input) -> Result<proc_macro2::TokenStream> {
         let mut fields = Vec::new();
         input.parsed_struct.fields.iter().for_each(|field| {
@@ -104,3 +105,95 @@ impl<'i> Builder<'i> for InnerFields {
     }
 }
 
+pub struct Table;
+
+impl<'i> Builder<'i> for Table {
+    fn build(self, input: &'i Input) -> Result<proc_macro2::TokenStream> {
+        let model = input.parsed_struct.as_snake_plural();
+        Ok(quote!(crate::schema::#model))
+    }
+}
+
+pub struct QueryableRow;
+
+impl<'i> Builder<'i> for QueryableRow {
+    fn build(self, input: &'i Input) -> Result<proc_macro2::TokenStream> {
+        let mut fields = Vec::new();
+        fields.push(quote!(i32));
+
+        input.parsed_struct.fields.iter().for_each(|field| {
+            let ty = field.ty();
+            fields.push(quote!(#ty));
+        });
+
+        Ok(quote!(type Row = (#(#fields,)*);))
+    }
+}
+
+pub struct QueryableFields;
+
+impl<'i> Builder<'i> for QueryableFields {
+    fn build(self, input: &'i Input) -> Result<proc_macro2::TokenStream> {
+        let mut fields = Vec::new();
+        let mut inner_fields = Vec::new();
+
+        let model_name = input.parsed_struct.inner_model_name();
+
+        let mut index = 0;
+
+        // Push id
+        let idx = Index::from(index);
+        fields.push(quote!(id: row.#idx));
+
+        input.parsed_struct.fields.iter().enumerate().for_each(|(i, field)| {
+            let field_name = &field.name;
+            if !field.fk() {
+                index = i + 1;
+                let idx = Index::from(index);
+                inner_fields.push(quote!(#field_name: row.#idx));
+            }
+        });
+
+        let generated_inner_fields = quote!({ #(#inner_fields,)* });
+
+        // Push inner fields
+        fields.push(quote!(inner: #model_name #generated_inner_fields));
+
+        // Push remaining fields
+        input.parsed_struct.fields.iter().for_each(|field| {
+            if field.fk() {
+                index = index + 1;
+                let name = &field.name;
+                let idx = Index::from(index);
+                fields.push(quote!(#name: row.#idx));
+            }
+        });
+
+        Ok(quote!(#(#fields,)*))
+    }
+}
+
+pub struct Queryable;
+
+impl<'i> Builder<'i> for Queryable {
+    fn build(self, input: &'i Input) -> Result<proc_macro2::TokenStream> {
+        let table = input.parsed_struct.as_snake_plural();
+        let fields = QueryableFields.build(input)?;
+        let row = QueryableRow.build(input)?;
+
+        let model_with_id = input.parsed_struct.model_name();
+
+        Ok(quote! {
+            impl diesel::Queryable<#table::SqlType, diesel::pg::Pg> for #model_with_id {
+                #row
+                fn build(row: Self::Row) -> Self {
+                    #model_with_id {
+                        #fields
+                    }
+                }
+            }
+        })
+    }
+}
+
+