Redesign CustomTable tuples to support resolving binary columns

1 files changed, 4 insertions, 3 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
index eff94e80..6edbdd1c 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
@@ -314,18 +314,19 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                                             break;
 
                                         case ColumnType.Object:
-                                            if (null != row[i])
+                                            var path = row.FieldAsString(i);
+                                            if (null != path)
                                             {
                                                 needStream = true;
                                                 try
                                                 {
-                                                    record.SetStream(i + 1, row.FieldAsString(i));
+                                                    record.SetStream(i + 1, path);
                                                 }
                                                 catch (Win32Exception e)
                                                 {
                                                     if (0xA1 == e.NativeErrorCode) // ERROR_BAD_PATHNAME
                                                     {
-                                                        throw new WixException(ErrorMessages.FileNotFound(row.SourceLineNumbers, row.FieldAsString(i)));
+                                                        throw new WixException(ErrorMessages.FileNotFound(row.SourceLineNumbers, path));
                                                     }
                                                     else
                                                     {