Always use WiX table definitions when decompiling standard tables.

2 files changed, 9 insertions, 10 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
index 038db0fa..557500e8 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
@@ -294,6 +294,13 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
 
         private TableDefinition GetTableDefinition(string tableName, View tableView, View validationView)
         {
+            // Use our table definitions whenever possible since they will be used when compiling the source code anyway.
+            // This also allows us to take advantage of WiX concepts like localizable columns which current code assumes.
+            if (this.TableDefinitions.Contains(tableName))
+            {
+                return this.TableDefinitions[tableName];
+            }
+
             ColumnDefinition[] columns;
             using (Record columnNameRecord = tableView.GetColumnInfo(MsiInterop.MSICOLINFONAMES),
                           columnTypeRecord = tableView.GetColumnInfo(MsiInterop.MSICOLINFOTYPES))
@@ -431,15 +438,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                 }
             }
 
-            var tableDefinition = new TableDefinition(tableName, columns, false);
-
-            // use our table definitions if core properties are the same; this allows us to take advantage
-            // of wix concepts like localizable columns which current code assumes
-            if (this.TableDefinitions.Contains(tableName) && 0 == tableDefinition.CompareTo(this.TableDefinitions[tableName]))
-            {
-                tableDefinition = this.TableDefinitions[tableName];
-            }
-            return tableDefinition;
+            return new TableDefinition(tableName, columns, false);
         }
 
         /// <summary>
diff --git a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
index c7c80f6e..c44393cf 100644
--- a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
@@ -94,7 +94,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void CanDecompileOldClassTableDefinition()
         {
             // The input MSI was not created using standard methods, it is an example of a real world database that needs to be decompiled.