From b240be4a7fb42c22e342319f0c5e436fc421e5de Mon Sep 17 00:00:00 2001
From: Ben Cassell <ben.cassell@databricks.com>
Date: Fri, 6 Dec 2024 13:23:12 -0800
Subject: [PATCH] merge other changes

---
 dbt/adapters/databricks/column.py | 2 +-
 tests/unit/test_constraints.py    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dbt/adapters/databricks/column.py b/dbt/adapters/databricks/column.py
index e3ff5f91..4e15e912 100644
--- a/dbt/adapters/databricks/column.py
+++ b/dbt/adapters/databricks/column.py
@@ -67,7 +67,7 @@ def render_for_create(self) -> str:
             column_str += f" COMMENT '{comment}'"
         for constraint in self.constraints or []:
             c = constraints.process_column_constraint(constraint)
-            if c != "":
+            if c:
                 column_str += f" {c}"
         return column_str
 
diff --git a/tests/unit/test_constraints.py b/tests/unit/test_constraints.py
index 343e0b71..0b6fc593 100644
--- a/tests/unit/test_constraints.py
+++ b/tests/unit/test_constraints.py
@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 import pytest
 from dbt_common.contracts.constraints import (
     ColumnLevelConstraint,
@@ -5,7 +7,6 @@
     ModelLevelConstraint,
 )
 from dbt_common.exceptions import DbtValidationError
-from mock import patch
 
 from dbt.adapters.databricks import constraints