From 45c92086eb284798cd726a0b1d1fbde5416cdb90 Mon Sep 17 00:00:00 2001
From: alexandrusoare <alexandrusoare98@gmail.com>
Date: Thu, 19 Mar 2026 14:19:58 +0200
Subject: [PATCH 1/2] fix(firebolt): use exclude instead

---
 superset/sql/dialects/firebolt.py             |  2 +
 tests/unit_tests/sql/test_firebolt_dialect.py | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 tests/unit_tests/sql/test_firebolt_dialect.py

diff --git a/superset/sql/dialects/firebolt.py b/superset/sql/dialects/firebolt.py
index d0a562dfa5e1..f930da0e2d1d 100644
--- a/superset/sql/dialects/firebolt.py
+++ b/superset/sql/dialects/firebolt.py
@@ -58,6 +58,8 @@ class Generator(generator.Generator):
         Custom generator for Firebolt.
         """
 
+        STAR_EXCEPT = "EXCLUDE"
+
         TYPE_MAPPING = {
             **generator.Generator.TYPE_MAPPING,
             exp.DataType.Type.VARBINARY: "BYTEA",
diff --git a/tests/unit_tests/sql/test_firebolt_dialect.py b/tests/unit_tests/sql/test_firebolt_dialect.py
new file mode 100644
index 000000000000..f6aaeed5f982
--- /dev/null
+++ b/tests/unit_tests/sql/test_firebolt_dialect.py
@@ -0,0 +1,58 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Tests for Firebolt dialect support in sqlglot."""
+
+from superset.sql.parse import SQLScript
+
+
+def test_firebolt_exclude_syntax() -> None:
+    """Test that Firebolt EXCLUDE syntax is preserved (not transformed to EXCEPT)."""
+    sql = "SELECT g.* EXCLUDE (source_file_timestamp) FROM public.games g"
+    script = SQLScript(sql, "firebolt")
+
+    generated = script.format()
+    assert "EXCLUDE" in generated
+    assert "EXCEPT" not in generated
+
+
+def test_firebolt_exclude_multiple_columns() -> None:
+    """Test EXCLUDE with multiple columns."""
+    sql = "SELECT * EXCLUDE (col1, col2, col3) FROM my_table"
+    script = SQLScript(sql, "firebolt")
+
+    generated = script.format()
+    assert "EXCLUDE" in generated
+    assert "EXCEPT" not in generated
+
+
+def test_firebolt_sql_parsing() -> None:
+    """Test that Firebolt SQL can be parsed without errors."""
+    sql = "SELECT * FROM my_table LIMIT 10"
+    script = SQLScript(sql, "firebolt")
+    assert len(script.statements) == 1
+    assert not script.has_mutation()
+
+
+def test_firebolt_not_in_parenthesized() -> None:
+    """Test that NOT IN is properly parenthesized in Firebolt."""
+    sql = "SELECT * FROM my_table WHERE id NOT IN (1, 2, 3)"
+    script = SQLScript(sql, "firebolt")
+
+    generated = script.format()
+    assert "NOT" in generated
+    assert "IN" in generated

From 9906877713f683f6262bd3556c0a859a3df8c205 Mon Sep 17 00:00:00 2001
From: alexandrusoare <alexandrusoare98@gmail.com>
Date: Thu, 19 Mar 2026 14:57:43 +0200
Subject: [PATCH 2/2] fix tests

---
 tests/unit_tests/sql/test_firebolt_dialect.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/unit_tests/sql/test_firebolt_dialect.py b/tests/unit_tests/sql/test_firebolt_dialect.py
index f6aaeed5f982..88d9e89e6801 100644
--- a/tests/unit_tests/sql/test_firebolt_dialect.py
+++ b/tests/unit_tests/sql/test_firebolt_dialect.py
@@ -28,6 +28,7 @@ def test_firebolt_exclude_syntax() -> None:
     generated = script.format()
     assert "EXCLUDE" in generated
     assert "EXCEPT" not in generated
+    assert "source_file_timestamp" in generated
 
 
 def test_firebolt_exclude_multiple_columns() -> None:
@@ -38,6 +39,9 @@ def test_firebolt_exclude_multiple_columns() -> None:
     generated = script.format()
     assert "EXCLUDE" in generated
     assert "EXCEPT" not in generated
+    assert "col1" in generated
+    assert "col2" in generated
+    assert "col3" in generated
 
 
 def test_firebolt_sql_parsing() -> None: