Add support: some mysql sql

CHANGELOG.md

@@ -9,6 +9,11 @@ Given that the parser produces a typed AST, any changes to the AST will technica
 Check https://github.com/ballista-compute/sqlparser-rs/commits/main for undocumented changes.
 
 
+## [0.8.0] 2020-03-21
+
+### Added
+* Add support for `TRY_CAST` syntax (#299) - Thanks @seddonm1!
+
 ## [0.8.0] 2020-02-20
 
 ### Added

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "sqlparser"
 description = "Extensible SQL Lexer and Parser with support for ANSI SQL:2011"
-version = "0.8.1-alpha.0"
+version = "0.9.1-alpha.0"
 authors = ["Andy Grove <andygrove73@gmail.com>"]
 homepage = "https://github.com/ballista-compute/sqlparser-rs"
 documentation = "https://docs.rs/sqlparser/"

src/ast/mod.rs

@@ -34,6 +34,7 @@ pub use self::query::{
     Values, With,
 };
 pub use self::value::{DateTimeField, Value};
+use std::option::Option::Some;
 
 struct DisplaySeparated<'a, T>
 where
@@ -201,6 +202,12 @@ pub enum Expr {
         expr: Box<Expr>,
         data_type: DataType,
     },
+    /// TRY_CAST an expression to a different data type e.g. `TRY_CAST(foo AS VARCHAR(123))`
+    //  this differs from CAST in the choice of how to implement invalid conversions
+    TryCast {
+        expr: Box<Expr>,
+        data_type: DataType,
+    },
     /// EXTRACT(DateTimeField FROM <expr>)
     Extract {
         field: DateTimeField,
@@ -253,6 +260,8 @@ pub enum Expr {
     Subquery(Box<Query>),
     /// The `LISTAGG` function `SELECT LISTAGG(...) WITHIN GROUP (ORDER BY ...)`
     ListAgg(ListAgg),
+    /// `?` Parameter Mark
+    ParameterMark(u32),
 }
 
 impl fmt::Display for Expr {
@@ -309,6 +318,7 @@ impl fmt::Display for Expr {
                 }
             }
             Expr::Cast { expr, data_type } => write!(f, "CAST({} AS {})", expr, data_type),
+            Expr::TryCast { expr, data_type } => write!(f, "TRY_CAST({} AS {})", expr, data_type),
             Expr::Extract { field, expr } => write!(f, "EXTRACT({} FROM {})", field, expr),
             Expr::Collate { expr, collation } => write!(f, "{} COLLATE {}", expr, collation),
             Expr::Nested(ast) => write!(f, "({})", ast),
@@ -355,6 +365,7 @@ impl fmt::Display for Expr {
 
                 write!(f, ")")
             }
+            Expr::ParameterMark(_) => write!(f, "?"),
         }
     }
 }
@@ -549,6 +560,8 @@ pub enum Statement {
         assignments: Vec<Assignment>,
         /// WHERE
         selection: Option<Expr>,
+        /// `LIMIT { <N> | ALL }`
+        limit: Option<Expr>,
     },
     /// DELETE
     Delete {
@@ -640,6 +653,10 @@ pub enum Statement {
     ///
     /// Note: this is a PostgreSQL-specific statement.
     ShowVariable { variable: Vec<Ident> },
+    /// USE <variable>
+    ///
+    /// Note: this is a MySQL-specific statement.
+    UseDatabase { variable: Ident },
     /// SHOW COLUMNS
     ///
     /// Note: this is a MySQL-specific statement.
@@ -651,12 +668,27 @@ pub enum Statement {
     },
     /// `{ BEGIN [ TRANSACTION | WORK ] | START TRANSACTION } ...`
     StartTransaction { modes: Vec<TransactionMode> },
-    /// `SET TRANSACTION ...`
-    SetTransaction { modes: Vec<TransactionMode> },
+    /// `SET [SESSION] TRANSACTION ...`
+    SetTransaction {
+        session: bool,
+        modes: Vec<TransactionMode>,
+    },
+    /// SET NAMES <variable>
+    ///
+    /// Note: this is a MySQL-specific statement.
+    SetNames { variable: Ident },
     /// `COMMIT [ TRANSACTION | WORK ] [ AND [ NO ] CHAIN ]`
     Commit { chain: bool },
+    /// `SAVEPOINT identifier`
+    Savepoint { variable: Ident },
     /// `ROLLBACK [ TRANSACTION | WORK ] [ AND [ NO ] CHAIN ]`
-    Rollback { chain: bool },
+    /// `ROLLBACK [WORK] TO [SAVEPOINT] identifier`
+    Rollback {
+        chain: bool,
+        savepoint: Option<Ident>,
+    },
+    /// RELEASE SAVEPOINT identifier
+    Release { variable: Ident },
     /// CREATE SCHEMA
     CreateSchema {
         schema_name: ObjectName,
@@ -869,6 +901,7 @@ impl fmt::Display for Statement {
                 table_name,
                 assignments,
                 selection,
+                limit,
             } => {
                 write!(f, "UPDATE {}", table_name)?;
                 if !assignments.is_empty() {
@@ -877,6 +910,9 @@ impl fmt::Display for Statement {
                 if let Some(selection) = selection {
                     write!(f, " WHERE {}", selection)?;
                 }
+                if let Some(ref limit) = limit {
+                    write!(f, " LIMIT {}", limit)?;
+                }
                 Ok(())
             }
             Statement::Delete {
@@ -1151,6 +1187,10 @@ impl fmt::Display for Statement {
                 }
                 Ok(())
             }
+            Statement::UseDatabase { variable } => {
+                write!(f, "USE {}", variable)?;
+                Ok(())
+            }
             Statement::ShowColumns {
                 extended,
                 full,
@@ -1176,18 +1216,38 @@ impl fmt::Display for Statement {
                 }
                 Ok(())
             }
-            Statement::SetTransaction { modes } => {
-                write!(f, "SET TRANSACTION")?;
+            Statement::SetTransaction { session, modes } => {
+                write!(
+                    f,
+                    "SET{} TRANSACTION",
+                    if *session { " SESSION" } else { "" }
+                )?;
                 if !modes.is_empty() {
                     write!(f, " {}", display_comma_separated(modes))?;
                 }
                 Ok(())
             }
+            Statement::SetNames { variable } => {
+                write!(f, "SET NAMES {}", variable)?;
+                Ok(())
+            }
             Statement::Commit { chain } => {
                 write!(f, "COMMIT{}", if *chain { " AND CHAIN" } else { "" },)
             }
-            Statement::Rollback { chain } => {
-                write!(f, "ROLLBACK{}", if *chain { " AND CHAIN" } else { "" },)
+            Statement::Savepoint { variable } => {
+                write!(f, "SAVEPOINT {}", variable)?;
+                Ok(())
+            }
+            Statement::Rollback { chain, savepoint } => {
+                if let Some(savepoint) = savepoint {
+                    write!(f, "ROLLBACK TO SAVEPOINT {}", savepoint)
+                } else {
+                    write!(f, "ROLLBACK{}", if *chain { " AND CHAIN" } else { "" },)
+                }
+            }
+            Statement::Release { variable } => {
+                write!(f, "RELEASE SAVEPOINT {}", variable)?;
+                Ok(())
             }
             Statement::CreateSchema {
                 schema_name,
@@ -1539,6 +1599,7 @@ impl fmt::Display for TransactionIsolationLevel {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum ShowStatementFilter {
     Like(String),
+    ILike(String),
     Where(Expr),
 }
 
@@ -1547,6 +1608,7 @@ impl fmt::Display for ShowStatementFilter {
         use ShowStatementFilter::*;
         match self {
             Like(pattern) => write!(f, "LIKE '{}'", value::escape_single_quote_string(pattern)),
+            ILike(pattern) => write!(f, "ILIKE {}", value::escape_single_quote_string(pattern)),
             Where(expr) => write!(f, "WHERE {}", expr),
         }
     }

src/ast/operator.rs

@@ -72,6 +72,8 @@ pub enum BinaryOperator {
     Or,
     Like,
     NotLike,
+    ILike,
+    NotILike,
     BitwiseOr,
     BitwiseAnd,
     BitwiseXor,
@@ -100,6 +102,8 @@ impl fmt::Display for BinaryOperator {
             BinaryOperator::Or => "OR",
             BinaryOperator::Like => "LIKE",
             BinaryOperator::NotLike => "NOT LIKE",
+            BinaryOperator::ILike => "ILIKE",
+            BinaryOperator::NotILike => "NOT ILIKE",
             BinaryOperator::BitwiseOr => "|",
             BinaryOperator::BitwiseAnd => "&",
             BinaryOperator::BitwiseXor => "^",

src/dialect/keywords.rs

@@ -236,6 +236,7 @@ define_keywords!(
     IDENTITY,
     IF,
     IGNORE,
+    ILIKE,
     IN,
     INDEX,
     INDICATOR,
@@ -291,6 +292,7 @@ define_keywords!(
     MONTH,
     MSCK,
     MULTISET,
+    NAMES,
     NATIONAL,
     NATURAL,
     NCHAR,
@@ -456,6 +458,7 @@ define_keywords!(
     TRIM_ARRAY,
     TRUE,
     TRUNCATE,
+    TRY_CAST,
     UESCAPE,
     UNBOUNDED,
     UNCOMMITTED,
@@ -465,6 +468,7 @@ define_keywords!(
     UNNEST,
     UPDATE,
     UPPER,
+    USE,
     USER,
     USING,
     UUID,

src/dialect/mysql.rs

@@ -24,6 +24,8 @@ impl Dialect for MySqlDialect {
             || ('A'..='Z').contains(&ch)
             || ch == '_'
             || ch == '$'
+            || ch == '@'
+            || ch == '?'
             || ('\u{0080}'..='\u{ffff}').contains(&ch)
     }