Handle TEXT type modifiers across dialects

Author: yoavcloud

src/parser/mod.rs

@@ -12170,20 +12170,13 @@ impl<'a> Parser<'a> {
                     self.expect_token(&Token::RParen)?;
                     Ok(DataType::FixedString(character_length))
                 }
-                Keyword::TEXT => {
-                    if dialect_is!(dialect is SnowflakeDialect) {
-                        if let Some(modifiers) = self.parse_optional_type_modifiers()? {
-                            Ok(DataType::Custom(
-                                ObjectName::from(vec![Ident::new("TEXT")]),
-                                modifiers,
-                            ))
-                        } else {
-                            Ok(DataType::Text)
-                        }
-                    } else {
-                        Ok(DataType::Text)
-                    }
-                }
+                Keyword::TEXT => match self.parse_optional_type_modifiers()? {
+                    Some(modifiers) => Ok(DataType::Custom(
+                        ObjectName::from(vec![Ident::new("TEXT")]),
+                        modifiers,
+                    )),
+                    None => Ok(DataType::Text),
+                },
                 Keyword::TINYTEXT => Ok(DataType::TinyText),
                 Keyword::MEDIUMTEXT => Ok(DataType::MediumText),
                 Keyword::LONGTEXT => Ok(DataType::LongText),
@@ -20213,7 +20206,7 @@ mod tests {
         use crate::ast::{
             CharLengthUnits, CharacterLength, DataType, ExactNumberInfo, ObjectName, TimezoneInfo,
         };
-        use crate::dialect::{AnsiDialect, GenericDialect, PostgreSqlDialect};
+        use crate::dialect::{AnsiDialect, GenericDialect, PostgreSqlDialect, SnowflakeDialect};
         use crate::test_utils::TestedDialects;
 
         macro_rules! test_parse_data_type {
@@ -20416,6 +20409,24 @@ mod tests {
             );
         }
 
+        #[test]
+        fn test_parse_text_with_length_as_custom_type() {
+            let dialect = TestedDialects::new(vec![
+                Box::new(GenericDialect {}),
+                Box::new(PostgreSqlDialect {}),
+                Box::new(SnowflakeDialect {}),
+            ]);
+
+            test_parse_data_type!(
+                dialect,
+                "TEXT(16777216)",
+                DataType::Custom(
+                    ObjectName::from(vec!["TEXT".into()]),
+                    vec!["16777216".to_string()]
+                )
+            );
+        }
+
         #[test]
         fn test_ansii_exact_numeric_types() {
             // Exact numeric types: <https://jakewheat.github.io/sql-overview/sql-2016-foundation-grammar.html#exact-numeric-type>

tests/sqlparser_snowflake.rs

@@ -5012,7 +5012,7 @@ fn test_select_dollar_column_from_stage() {
 }
 
 #[test]
-fn test_parse_pg_style_cast_to_text_with_length() {
+fn test_parse_cast_to_text_with_length() {
     let select = snowflake().verified_only_select(
         "SELECT _ID::TEXT(16777216) AS _ID FROM INCARE_ANALYTICS.USER_DETAILS",
     );
@@ -5038,24 +5038,3 @@ fn test_parse_pg_style_cast_to_text_with_length() {
         _ => unreachable!(),
     }
 }
-
-#[test]
-fn test_parse_cast_function_to_text_with_length() {
-    let select = snowflake().verified_only_select("SELECT CAST(_ID AS TEXT(42)) FROM USER_DETAILS");
-    match expr_from_projection(only(&select.projection)) {
-        Expr::Cast {
-            kind: CastKind::Cast,
-            data_type,
-            ..
-        } => {
-            assert_eq!(
-                *data_type,
-                DataType::Custom(
-                    ObjectName::from(vec![Ident::new("TEXT")]),
-                    vec!["42".to_string()],
-                )
-            );
-        }
-        _ => unreachable!(),
-    }
-}