From a0165e34f31cd03ac5bd2e2b8a0b08ee0096c1a2 Mon Sep 17 00:00:00 2001
From: Yoav Cohen <yoav@satoricyber.com>
Date: Fri, 26 Dec 2025 07:49:06 +0100
Subject: [PATCH] Redshift: Add support for optional JSON format in copy option

---
 src/ast/mod.rs            | 12 +++++++++---
 src/parser/mod.rs         | 10 +++++++++-
 tests/sqlparser_common.rs |  6 ++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index 467678602..5d0fdb6e4 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -8296,8 +8296,8 @@ pub enum CopyLegacyOption {
     IamRole(IamRoleKind),
     /// IGNOREHEADER \[ AS \] number_rows
     IgnoreHeader(u64),
-    /// JSON
-    Json,
+    /// JSON \[ AS \] 'json_option'
+    Json(Option<String>),
     /// MANIFEST \[ VERBOSE \]
     Manifest { verbose: bool },
     /// MAXFILESIZE \[ AS \] max-size \[ MB | GB \]
@@ -8388,7 +8388,13 @@ impl fmt::Display for CopyLegacyOption {
             Header => write!(f, "HEADER"),
             IamRole(role) => write!(f, "IAM_ROLE {role}"),
             IgnoreHeader(num_rows) => write!(f, "IGNOREHEADER {num_rows}"),
-            Json => write!(f, "JSON"),
+            Json(opt) => {
+                write!(f, "JSON")?;
+                if let Some(opt) = opt {
+                    write!(f, " AS '{}'", value::escape_single_quote_string(opt))?;
+                }
+                Ok(())
+            }
             Manifest { verbose } => write!(f, "MANIFEST{}", if *verbose { " VERBOSE" } else { "" }),
             MaxFileSize(file_size) => write!(f, "MAXFILESIZE {file_size}"),
             Null(string) => write!(f, "NULL '{}'", value::escape_single_quote_string(string)),
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index d1c4fe05b..368970911 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -10621,7 +10621,15 @@ impl<'a> Parser<'a> {
                 let num_rows = self.parse_literal_uint()?;
                 CopyLegacyOption::IgnoreHeader(num_rows)
             }
-            Some(Keyword::JSON) => CopyLegacyOption::Json,
+            Some(Keyword::JSON) => {
+                let _ = self.parse_keyword(Keyword::AS);
+                let fmt = if matches!(self.peek_token().token, Token::SingleQuotedString(_)) {
+                    Some(self.parse_literal_string()?)
+                } else {
+                    None
+                };
+                CopyLegacyOption::Json(fmt)
+            }
             Some(Keyword::MANIFEST) => {
                 let verbose = self.parse_keyword(Keyword::VERBOSE);
                 CopyLegacyOption::Manifest { verbose }
diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
index 9f549e4d0..b2006f260 100644
--- a/tests/sqlparser_common.rs
+++ b/tests/sqlparser_common.rs
@@ -17398,6 +17398,9 @@ fn parse_copy_options() {
             "EMPTYASNULL ",
             "IAM_ROLE DEFAULT ",
             "IGNOREHEADER AS 1 ",
+            "JSON ",
+            "JSON 'auto' ",
+            "JSON AS 'auto' ",
             "TIMEFORMAT AS 'auto' ",
             "TRUNCATECOLUMNS ",
             "REMOVEQUOTES ",
@@ -17423,6 +17426,9 @@ fn parse_copy_options() {
             "EMPTYASNULL ",
             "IAM_ROLE DEFAULT ",
             "IGNOREHEADER 1 ",
+            "JSON ",
+            "JSON AS 'auto' ",
+            "JSON AS 'auto' ",
             "TIMEFORMAT 'auto' ",
             "TRUNCATECOLUMNS ",
             "REMOVEQUOTES ",