From 09c851265ee2f270688416e80c8951661794e7c7 Mon Sep 17 00:00:00 2001
From: Mohit Tilala <63147650+mohittilala@users.noreply.github.com>
Date: Tue, 14 Oct 2025 12:51:07 +0530
Subject: [PATCH] [Redshift] Add better handling of incomplete redshift view
 definition (#23866)

* Add better handling of incomplete redshift view definition

* Match exact definitions in tests

* Correct isort on tests
---
 .../source/database/redshift/utils.py         |  3 +-
 .../topology/database/test_redshift_utils.py  | 97 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 ingestion/tests/unit/topology/database/test_redshift_utils.py

diff --git a/ingestion/src/metadata/ingestion/source/database/redshift/utils.py b/ingestion/src/metadata/ingestion/source/database/redshift/utils.py
index c2bf9a8be3a..0eeb1dff12b 100644
--- a/ingestion/src/metadata/ingestion/source/database/redshift/utils.py
+++ b/ingestion/src/metadata/ingestion/source/database/redshift/utils.py
@@ -413,7 +413,8 @@ def get_view_definition(self, connection, view_name, schema=None, **kw):
     view = self._get_redshift_relation(connection, view_name, schema, **kw)
     pattern = re.compile("WITH NO SCHEMA BINDING", re.IGNORECASE)
     view_definition = str(sa.text(pattern.sub("", view.view_definition)))
-    if not view_definition.startswith("create"):
+    create_view_pattern = re.compile(r"CREATE\s+VIEW", re.IGNORECASE)
+    if not create_view_pattern.search(view_definition):
         view_definition = (
             f"CREATE VIEW {view.schema}.{view.relname} AS {view_definition}"
         )
diff --git a/ingestion/tests/unit/topology/database/test_redshift_utils.py b/ingestion/tests/unit/topology/database/test_redshift_utils.py
new file mode 100644
index 00000000000..ef7f1d97c45
--- /dev/null
+++ b/ingestion/tests/unit/topology/database/test_redshift_utils.py
@@ -0,0 +1,97 @@
+#  Copyright 2025 Collate
+#  Licensed under the Collate Community License, Version 1.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#  https://github.com/open-metadata/OpenMetadata/blob/main/ingestion/LICENSE
+#  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.
+
+"""Test Redshift Utils"""
+
+import unittest
+from unittest.mock import MagicMock, Mock
+
+from metadata.ingestion.source.database.redshift.utils import get_view_definition
+
+
+class TestRedshiftUtils(unittest.TestCase):
+    """Test Redshift Utils"""
+
+    def setUp(self):
+        """Set up test fixtures"""
+        self.mock_connection = Mock()
+        self.mock_self = Mock()
+        self.mock_view = Mock()
+        self.mock_view.schema = "test_schema"
+        self.mock_view.relname = "test_view"
+        self.mock_self._get_redshift_relation = MagicMock(return_value=self.mock_view)
+
+    def test_view_definition_with_create_view(self):
+        """Test that view definition with CREATE VIEW is not modified"""
+        self.mock_view.view_definition = (
+            "CREATE VIEW test_schema.test_view AS SELECT * FROM table1"
+        )
+
+        result = get_view_definition(
+            self.mock_self,
+            self.mock_connection,
+            "test_view",
+            schema="test_schema",
+        )
+
+        self.assertEqual(
+            result, "CREATE VIEW test_schema.test_view AS SELECT * FROM table1"
+        )
+
+    def test_view_definition_without_create_view(self):
+        """Test that view definition without CREATE VIEW gets it prepended"""
+        self.mock_view.view_definition = "SELECT * FROM table1"
+
+        result = get_view_definition(
+            self.mock_self,
+            self.mock_connection,
+            "test_view",
+            schema="test_schema",
+        )
+
+        self.assertEqual(
+            result, "CREATE VIEW test_schema.test_view AS SELECT * FROM table1"
+        )
+
+    def test_view_definition_with_sql_comment_before_create(self):
+        """Test view definition with SQL comment before CREATE VIEW (expected scenario)"""
+        self.mock_view.view_definition = "/* some comment */\n\tCREATE VIEW test_schema.test_view AS SELECT * FROM table1"
+
+        result = get_view_definition(
+            self.mock_self,
+            self.mock_connection,
+            "test_view",
+            schema="test_schema",
+        )
+
+        self.assertEqual(
+            result,
+            "/* some comment */\n\tCREATE VIEW test_schema.test_view AS SELECT * FROM table1",
+        )
+
+    def test_view_definition_removes_schema_binding(self):
+        """Test that WITH NO SCHEMA BINDING is removed"""
+        self.mock_view.view_definition = "CREATE VIEW test_schema.test_view AS SELECT * FROM table1 WITH NO SCHEMA BINDING"
+
+        result = get_view_definition(
+            self.mock_self,
+            self.mock_connection,
+            "test_view",
+            schema="test_schema",
+        )
+
+        self.assertEqual(
+            result, "CREATE VIEW test_schema.test_view AS SELECT * FROM table1 "
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()