Streamline Iden quoting

Author: Expurple

sea-query-derive/src/enum_def.rs

@@ -89,12 +89,6 @@ pub fn expand(args: TokenStream, input: TokenStream) -> TokenStream {
             }
         }
 
-        impl #import_name::Iden for #enum_name {
-            fn unquoted(&self) -> &str {
-                <Self as #import_name::IdenStatic>::as_str(&self)
-            }
-        }
-
         impl ::std::convert::AsRef<str> for #enum_name {
             fn as_ref(&self) -> &str {
                 <Self as #import_name::IdenStatic>::as_str(&self)

sea-query-derive/src/iden/mod.rs

@@ -57,25 +57,10 @@ fn impl_iden_for_unit_struct(
     table_name: &str,
 ) -> proc_macro2::TokenStream {
     let sea_query_path = sea_query_path();
-
-    if is_static_iden(table_name) {
-        quote! {
-            impl #sea_query_path::Iden for #ident {
-                fn quoted(&self) -> std::borrow::Cow<'static, str> {
-                    std::borrow::Cow::Borrowed(#table_name)
-                }
-
-                fn unquoted(&self) -> &str {
-                    #table_name
-                }
-            }
-        }
-    } else {
-        quote! {
-            impl #sea_query_path::Iden for #ident {
-                fn unquoted(&self) -> &str {
-                    #table_name
-                }
+    quote! {
+        impl #sea_query_path::IdenStatic for #ident {
+            fn as_str(&self) -> &'static str {
+                #table_name
             }
         }
     }
@@ -91,43 +76,19 @@ where
 {
     let sea_query_path = sea_query_path();
 
-    let mut is_all_static_iden = true;
-
     let match_arms = match variants
-        .map(|v| {
-            let v = IdenVariant::<DeriveIden>::try_from((table_name, v))?;
-            is_all_static_iden &= v.is_static_iden();
-            Ok(v)
-        })
+        .map(|v| IdenVariant::<DeriveIden>::try_from((table_name, v)))
         .collect::<syn::Result<Vec<_>>>()
     {
         Ok(v) => v,
         Err(e) => return e.to_compile_error(),
     };
 
-    if is_all_static_iden {
-        quote! {
-            impl #sea_query_path::Iden for #ident {
-                fn quoted(&self) -> std::borrow::Cow<'static, str> {
-                    std::borrow::Cow::Borrowed(match self {
-                        #(#match_arms),*
-                    })
-                }
-
-                fn unquoted(&self) -> &str {
-                    match self {
-                        #(#match_arms),*
-                    }
-                }
-            }
-        }
-    } else {
-        quote! {
-            impl #sea_query_path::Iden for #ident {
-                fn unquoted(&self) -> &str {
-                    match self {
-                        #(#match_arms),*
-                    }
+    quote! {
+        impl #sea_query_path::IdenStatic for #ident {
+            fn as_str(&self) -> &'static str {
+                match self {
+                    #(#match_arms),*
                 }
             }
         }
@@ -190,11 +151,3 @@ fn find_attr(attrs: &[Attribute]) -> Option<&Attribute> {
         attr.path().is_ident(&IdenPath::Iden) || attr.path().is_ident(&IdenPath::Method)
     })
 }
-
-pub fn is_static_iden(name: &str) -> bool {
-    // can only begin with [a-z_]
-    name.chars()
-        .take(1)
-        .all(|c| c == '_' || c.is_ascii_alphabetic())
-        && name.chars().all(|c| c == '_' || c.is_ascii_alphanumeric())
-}

sea-query-derive/src/iden/write_arm.rs

@@ -6,9 +6,7 @@ use proc_macro2::{Span, TokenStream};
 use quote::{ToTokens, TokenStreamExt, quote};
 use syn::{Error, Fields, FieldsNamed, Ident, Variant};
 
-use super::{
-    DeriveIden, DeriveIdenStatic, attr::IdenAttr, error::ErrorMsg, find_attr, is_static_iden,
-};
+use super::{DeriveIden, DeriveIdenStatic, attr::IdenAttr, error::ErrorMsg, find_attr};
 
 pub(crate) trait WriteArm {
     fn variant(variant: TokenStream, name: TokenStream) -> TokenStream;
@@ -180,19 +178,6 @@ where
 
         T::variant(variant, name)
     }
-
-    pub(crate) fn is_static_iden(&self) -> bool {
-        let name: String = match &self.attr {
-            Some(a) => match a {
-                IdenAttr::Rename(name) => name.to_owned(),
-                IdenAttr::Method(_) => return false,
-                IdenAttr::Flatten => return false,
-            },
-            None => self.table_or_snake_case(),
-        };
-
-        is_static_iden(&name)
-    }
 }
 
 struct Delegated;

src/backend/mod.rs

@@ -1,7 +1,6 @@
 //! Translating the SQL AST into engine-specific SQL statements.
 
 use crate::*;
-use std::borrow::Cow;
 
 #[cfg(feature = "backend-mysql")]
 #[cfg_attr(docsrs, doc(cfg(feature = "backend-mysql")))]
@@ -46,17 +45,12 @@ pub trait QuotedBuilder {
         let qq = q.1 as char;
 
         sql.write_char(q.left()).unwrap();
-        match &iden.0 {
-            Cow::Borrowed(s) => sql.write_str(s).unwrap(),
-            Cow::Owned(s) => {
-                for char in s.chars() {
-                    if char == qq {
-                        sql.write_char(char).unwrap()
-                    }
-                    sql.write_char(char).unwrap()
-                }
+        for char in iden.0.chars() {
+            if char == qq {
+                sql.write_char(char).unwrap()
             }
-        };
+            sql.write_char(char).unwrap()
+        }
         sql.write_char(q.right()).unwrap();
     }
 }

src/extension/mysql/column.rs

@@ -1,4 +1,4 @@
-use crate::Iden;
+use crate::IdenStatic;
 
 #[derive(Debug, Copy, Clone)]
 #[non_exhaustive]
@@ -8,8 +8,8 @@ pub enum MySqlType {
     LongBlob,
 }
 
-impl Iden for MySqlType {
-    fn unquoted(&self) -> &str {
+impl IdenStatic for MySqlType {
+    fn as_str(&self) -> &'static str {
         match self {
             Self::TinyBlob => "tinyblob",
             Self::MediumBlob => "mediumblob",

src/extension/postgres/ltree.rs

@@ -1,4 +1,4 @@
-use crate::Iden;
+use crate::{Iden, IdenStatic};
 
 /// PostgreSQL `ltree` extension type.
 ///
@@ -50,8 +50,8 @@ use crate::Iden;
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct PgLTree;
 
-impl Iden for PgLTree {
-    fn unquoted(&self) -> &str {
+impl IdenStatic for PgLTree {
+    fn as_str(&self) -> &'static str {
         "ltree"
     }
 }

src/extension/postgres/types.rs

@@ -154,8 +154,8 @@ impl TypeDropStatement {
     ///
     /// struct FontFamily;
     ///
-    /// impl Iden for FontFamily {
-    ///     fn unquoted(&self) -> &str {
+    /// impl IdenStatic for FontFamily {
+    ///     fn as_str(&self) -> &'static str {
     ///         "font_family"
     ///     }
     /// }
@@ -254,8 +254,8 @@ impl TypeAlterStatement {
     ///     Monospace,
     /// }
     ///
-    /// impl Iden for FontFamily {
-    ///     fn unquoted(&self) -> &str {
+    /// impl IdenStatic for FontFamily {
+    ///     fn as_str(&self) -> &'static str {
     ///         match self {
     ///             Self::Type => "font_family",
     ///             Self::Serif => "serif",

src/lib.rs

@@ -664,8 +664,8 @@
 //! # use sea_query::{*, tests_cfg::*};
 //! struct MyFunction;
 //!
-//! impl Iden for MyFunction {
-//!     fn unquoted(&self) -> &str {
+//! impl IdenStatic for MyFunction {
+//!     fn as_str(&self) -> &'static str {
 //!         "MY_FUNCTION"
 //!     }
 //! }

src/tests_cfg.rs

@@ -3,7 +3,7 @@
 #[cfg(feature = "with-json")]
 pub use serde_json::json;
 
-use crate::Iden;
+use crate::IdenStatic;
 
 /// Representation of a database table named `Character`.
 ///
@@ -27,8 +27,8 @@ pub enum Character {
 /// A shorthand for [`Character`]
 pub type Char = Character;
 
-impl Iden for Character {
-    fn unquoted(&self) -> &str {
+impl IdenStatic for Character {
+    fn as_str(&self) -> &'static str {
         match self {
             Self::Table => "character",
             Self::Id => "id",
@@ -58,8 +58,8 @@ pub enum Font {
     Language,
 }
 
-impl Iden for Font {
-    fn unquoted(&self) -> &str {
+impl IdenStatic for Font {
+    fn as_str(&self) -> &'static str {
         match self {
             Self::Table => "font",
             Self::Id => "id",
@@ -84,8 +84,8 @@ pub enum Glyph {
     Tokens,
 }
 
-impl Iden for Glyph {
-    fn unquoted(&self) -> &str {
+impl IdenStatic for Glyph {
+    fn as_str(&self) -> &'static str {
         match self {
             Self::Table => "glyph",
             Self::Id => "id",
@@ -108,8 +108,8 @@ pub enum Task {
     IsDone,
 }
 
-impl Iden for Task {
-    fn unquoted(&self) -> &str {
+impl IdenStatic for Task {
+    fn as_str(&self) -> &'static str {
         match self {
             Self::Table => "task",
             Self::Id => "id",