resolving conflicts

Author: gargsaumya

mssql_python/constants.py

@@ -376,11 +376,8 @@ def get_valid_types(cls) -> set:
             ConstantsDDBC.SQL_DATETIMEOFFSET.value,
             ConstantsDDBC.SQL_SS_XML.value,
             ConstantsDDBC.SQL_GUID.value,
-<<<<<<< HEAD
             ConstantsDDBC.SQL_SS_UDT.value,
-=======
             ConstantsDDBC.SQL_SS_VARIANT.value,
->>>>>>> a7cc4c0d (Add SQL_VARIANT data type support with native Python type preservation)
         }
 
     # Could also add category methods for convenience

mssql_python/pybind/ddbc_bindings.cpp

@@ -2977,7 +2977,7 @@ static inline bool IsLobOrVariantColumn(SQLSMALLINT dataType, SQLULEN columnSize
     return dataType == SQL_SS_VARIANT ||
            ((dataType == SQL_WVARCHAR || dataType == SQL_WLONGVARCHAR || dataType == SQL_VARCHAR ||
              dataType == SQL_LONGVARCHAR || dataType == SQL_VARBINARY ||
-             dataType == SQL_LONGVARBINARY || dataType == SQL_SS_XML) &&
+             dataType == SQL_LONGVARBINARY || dataType == SQL_SS_XML || dataType == SQL_SS_UDT) &&
             (columnSize == 0 || columnSize == SQL_NO_TOTAL || columnSize > SQL_MAX_LOB_SIZE));
 }