fix: Add support for MAX for NVARCHAR (apache#1232)

bombsimon · web-flow · commit b51f2a0c25f3 · 2024-04-26T13:56:37.000-04:00
diff --git a/src/ast/data_type.rs b/src/ast/data_type.rs
@@ -40,7 +40,7 @@ pub enum DataType {
     /// Variable-length character type e.g. VARCHAR(10)
     Varchar(Option<CharacterLength>),
     /// Variable-length character type e.g. NVARCHAR(10)
-    Nvarchar(Option<u64>),
+    Nvarchar(Option<CharacterLength>),
     /// Uuid type
     Uuid,
     /// Large character object with optional length e.g. CHARACTER LARGE OBJECT, CHARACTER LARGE OBJECT(1000), [standard]
@@ -238,9 +238,7 @@ impl fmt::Display for DataType {
 
             DataType::CharVarying(size) => format_character_string_type(f, "CHAR VARYING", size),
             DataType::Varchar(size) => format_character_string_type(f, "VARCHAR", size),
-            DataType::Nvarchar(size) => {
-                format_type_with_optional_length(f, "NVARCHAR", size, false)
-            }
+            DataType::Nvarchar(size) => format_character_string_type(f, "NVARCHAR", size),
             DataType::Uuid => write!(f, "UUID"),
             DataType::CharacterLargeObject(size) => {
                 format_type_with_optional_length(f, "CHARACTER LARGE OBJECT", size, false)
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
@@ -6451,7 +6451,9 @@ impl<'a> Parser<'a> {
                     }
                 }
                 Keyword::VARCHAR => Ok(DataType::Varchar(self.parse_optional_character_length()?)),
-                Keyword::NVARCHAR => Ok(DataType::Nvarchar(self.parse_optional_precision()?)),
+                Keyword::NVARCHAR => {
+                    Ok(DataType::Nvarchar(self.parse_optional_character_length()?))
+                }
                 Keyword::CHARACTER => {
                     if self.parse_keyword(Keyword::VARYING) {
                         Ok(DataType::CharacterVarying(
diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
@@ -2258,7 +2258,10 @@ fn parse_cast() {
         &Expr::Cast {
             kind: CastKind::Cast,
             expr: Box::new(Expr::Identifier(Ident::new("id"))),
-            data_type: DataType::Nvarchar(Some(50)),
+            data_type: DataType::Nvarchar(Some(CharacterLength::IntegerLength {
+                length: 50,
+                unit: None,
+            })),
             format: None,
         },
         expr_from_projection(only(&select.projection))
diff --git a/tests/sqlparser_mssql.rs b/tests/sqlparser_mssql.rs
@@ -431,6 +431,7 @@ fn parse_for_json_expect_ast() {
 #[test]
 fn parse_cast_varchar_max() {
     ms_and_generic().verified_expr("CAST('foo' AS VARCHAR(MAX))");
+    ms_and_generic().verified_expr("CAST('foo' AS NVARCHAR(MAX))");
 }
 
 #[test]

Original file line number	Diff line number	Diff line change
`@@ -6451,7 +6451,9 @@ impl<'a> Parser<'a> {`
`6451`	`6451`	`}`
`6452`	`6452`	`}`
`6453`	`6453`	`Keyword::VARCHAR => Ok(DataType::Varchar(self.parse_optional_character_length()?)),`
`6454`		`- Keyword::NVARCHAR => Ok(DataType::Nvarchar(self.parse_optional_precision()?)),`
	`6454`	`+ Keyword::NVARCHAR => {`
	`6455`	`+ Ok(DataType::Nvarchar(self.parse_optional_character_length()?))`
	`6456`	`+ }`
`6455`	`6457`	`Keyword::CHARACTER => {`
`6456`	`6458`	`if self.parse_keyword(Keyword::VARYING) {`
`6457`	`6459`	`Ok(DataType::CharacterVarying(`
Original file line number	Diff line number	Diff line change
`@@ -431,6 +431,7 @@ fn parse_for_json_expect_ast() {`
`431`	`431`	`#[test]`
`432`	`432`	`fn parse_cast_varchar_max() {`
`433`	`433`	`ms_and_generic().verified_expr("CAST('foo' AS VARCHAR(MAX))");`
	`434`	`+ ms_and_generic().verified_expr("CAST('foo' AS NVARCHAR(MAX))");`
`434`	`435`	`}`
`435`	`436`
`436`	`437`	`#[test]`