Revert "support for SELECT TOP on snowflake (#14)"

This reverts commit 3286219.

Author: jmhain

src/ast/mod.rs

@@ -30,8 +30,7 @@ pub use self::ddl::{
 pub use self::operator::{BinaryOperator, UnaryOperator};
 pub use self::query::{
     Cte, Fetch, Join, JoinConstraint, JoinOperator, Offset, OffsetRows, OrderByExpr, Query, Select,
-    SelectItem, SetExpr, SetOperator, TableAlias, TableFactor, TableWithJoins, Top, TopQuantity,
-    Values, With,
+    SelectItem, SetExpr, SetOperator, TableAlias, TableFactor, TableWithJoins, Top, Values, With,
 };
 pub use self::value::{DateTimeField, Value};
 

src/ast/query.rs

@@ -654,32 +654,17 @@ impl fmt::Display for Fetch {
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Top {
     /// SQL semantic equivalent of LIMIT but with same structure as FETCH.
-    /// MSSQL only.
     pub with_ties: bool,
-    /// MSSQL only.
     pub percent: bool,
-    pub quantity: Option<TopQuantity>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum TopQuantity {
-    // A parenthesized expression. MSSQL only.
-    Expr(Expr),
-    // An unparenthesized integer constant.
-    Constant(u64),
+    pub quantity: Option<Expr>,
 }
 
 impl fmt::Display for Top {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let extension = if self.with_ties { " WITH TIES" } else { "" };
         if let Some(ref quantity) = self.quantity {
             let percent = if self.percent { " PERCENT" } else { "" };
-            match quantity {
-                TopQuantity::Expr(quantity) => write!(f, "TOP ({quantity}){percent}{extension}"),
-                TopQuantity::Constant(quantity) => {
-                    write!(f, "TOP {quantity}{percent}{extension}")
-                }
-            }
+            write!(f, "TOP ({}){}{}", quantity, percent, extension)
         } else {
             write!(f, "TOP{}", extension)
         }

src/parser.rs

@@ -2983,14 +2983,9 @@ impl<'a> Parser<'a> {
         let quantity = if self.consume_token(&Token::LParen) {
             let quantity = self.parse_expr()?;
             self.expect_token(&Token::RParen)?;
-            Some(TopQuantity::Expr(quantity))
+            Some(quantity)
         } else {
-            let next_token = self.next_token();
-            let quantity = match next_token {
-                Token::Number(s) => s.parse::<u64>().expect("literal int"),
-                _ => self.expected("literal int", next_token)?,
-            };
-            Some(TopQuantity::Constant(quantity))
+            Some(self.parse_number_value_or_ident()?)
         };
 
         let percent = self.parse_keyword(Keyword::PERCENT);

tests/sqlparser_mssql.rs

@@ -76,10 +76,7 @@ fn parse_mssql_top_paren() {
     let sql = "SELECT TOP (5) * FROM foo";
     let select = ms_and_generic().verified_only_select(sql);
     let top = select.top.unwrap();
-    assert_eq!(
-        Some(TopQuantity::Expr(Expr::Value(number("5")))),
-        top.quantity
-    );
+    assert_eq!(Some(Expr::Value(number("5"))), top.quantity);
     assert!(!top.percent);
 }
 
@@ -88,10 +85,7 @@ fn parse_mssql_top_percent() {
     let sql = "SELECT TOP (5) PERCENT * FROM foo";
     let select = ms_and_generic().verified_only_select(sql);
     let top = select.top.unwrap();
-    assert_eq!(
-        Some(TopQuantity::Expr(Expr::Value(number("5")))),
-        top.quantity
-    );
+    assert_eq!(Some(Expr::Value(number("5"))), top.quantity);
     assert!(top.percent);
 }
 
@@ -100,10 +94,7 @@ fn parse_mssql_top_with_ties() {
     let sql = "SELECT TOP (5) WITH TIES * FROM foo";
     let select = ms_and_generic().verified_only_select(sql);
     let top = select.top.unwrap();
-    assert_eq!(
-        Some(TopQuantity::Expr(Expr::Value(number("5")))),
-        top.quantity
-    );
+    assert_eq!(Some(Expr::Value(number("5"))), top.quantity);
     assert!(top.with_ties);
 }
 
@@ -112,17 +103,14 @@ fn parse_mssql_top_percent_with_ties() {
     let sql = "SELECT TOP (10) PERCENT WITH TIES * FROM foo";
     let select = ms_and_generic().verified_only_select(sql);
     let top = select.top.unwrap();
-    assert_eq!(
-        Some(TopQuantity::Expr(Expr::Value(number("10")))),
-        top.quantity
-    );
+    assert_eq!(Some(Expr::Value(number("10"))), top.quantity);
     assert!(top.percent);
 }
 
 #[test]
 fn parse_mssql_top() {
     let sql = "SELECT TOP 5 bar, baz FROM foo";
-    let _ = ms_and_generic().one_statement_parses_to(sql, "SELECT TOP 5 bar, baz FROM foo");
+    let _ = ms_and_generic().one_statement_parses_to(sql, "SELECT TOP (5) bar, baz FROM foo");
 }
 
 fn ms() -> TestedDialects {

tests/sqlparser_snowflake.rs

@@ -200,11 +200,3 @@ fn snowflake_and_generic() -> TestedDialects {
         dialects: vec![Box::new(SnowflakeDialect {}), Box::new(GenericDialect {})],
     }
 }
-
-#[test]
-fn parse_top() {
-    snowflake().one_statement_parses_to(
-        "SELECT TOP 4 c1 FROM testtable",
-        "SELECT TOP 4 c1 FROM testtable",
-    );
-}