token includes span, ident is token

Author: vemoo

src/ast/ddl.rs

@@ -1,5 +1,6 @@
 //! AST types specific to CREATE/ALTER variants of `SQLStatement`
 //! (commonly referred to as Data Definition Language, or DDL)
+use super::IdentVec;
 use super::{DataType, Expr, Ident, ObjectName};
 
 /// An `ALTER TABLE` (`SQLStatement::SQLAlterTable`) operation

src/ast/mod.rs

@@ -18,6 +18,7 @@ mod operator;
 mod query;
 mod value;
 
+use super::tokenizer::Token;
 use std::ops::Deref;
 
 pub use self::data_type::DataType;
@@ -45,7 +46,46 @@ where
 }
 
 /// Identifier name, in the originally quoted form (e.g. `"id"`)
-pub type Ident = String;
+#[derive(Debug, Clone, Eq, Hash)]
+pub struct Ident {
+    pub token: Token,
+}
+
+impl PartialEq for Ident {
+    fn eq(&self, other: &Self) -> bool {
+        self.to_string() == other.to_string()
+    }
+}
+
+impl PartialEq<String> for Ident {
+    fn eq(&self, other: &String) -> bool {
+        &self.to_string() == other
+    }
+}
+
+impl std::fmt::Display for Ident {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        f.write_str(&self.token.kind.to_string())
+    }
+}
+
+trait IdentVec {
+    fn join(&self, sep: &str) -> String;
+}
+
+impl IdentVec for Vec<Ident> {
+    fn join(&self, sep: &str) -> String {
+        use std::fmt::Write;
+        let mut res = String::new();
+        let mut delim = "";
+        for x in self {
+            res.push_str(delim);
+            delim = sep;
+            write!(&mut res, "{}", x).unwrap();
+        }
+        res
+    }
+}
 
 /// An SQL expression of any type.
 ///

src/ast/query.rs

@@ -291,7 +291,7 @@ pub struct TableAlias {
 
 impl ToString for TableAlias {
     fn to_string(&self) -> String {
-        let mut s = self.name.clone();
+        let mut s = self.name.to_string();
         if !self.columns.is_empty() {
             s += &format!(" ({})", comma_separated_string(&self.columns));
         }