From 94b941ee95a294228516097c269e27dfa41593ab Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 13 Jan 2020 09:10:13 -0800 Subject: Provide Record enumerator on View that disposes fetched Records --- .../Bind/ProcessUncompressedFilesCommand.cs | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs index 64fb3e4d..373ada38 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs @@ -57,25 +57,17 @@ namespace WixToolset.Core.WindowsInstaller.Bind var mediaRows = this.Section.Tuples.OfType().ToDictionary(t => t.DiskId); - using (Database db = new Database(this.DatabasePath, OpenDatabase.ReadOnly)) + using (var db = new Database(this.DatabasePath, OpenDatabase.ReadOnly)) { - using (View directoryView = db.OpenExecuteView("SELECT `Directory`, `Directory_Parent`, `DefaultDir` FROM `Directory`")) + using (var directoryView = db.OpenExecuteView("SELECT `Directory`, `Directory_Parent`, `DefaultDir` FROM `Directory`")) { - while (true) + foreach (var directoryRecord in directoryView.Records) { - using (Record directoryRecord = directoryView.Fetch()) - { - if (null == directoryRecord) - { - break; - } + var sourceName = Common.GetName(directoryRecord.GetString(3), true, this.LongNamesInImage); - string sourceName = Common.GetName(directoryRecord.GetString(3), true, this.LongNamesInImage); + var resolvedDirectory = this.BackendHelper.CreateResolvedDirectory(directoryRecord.GetString(2), sourceName); - var resolvedDirectory = this.BackendHelper.CreateResolvedDirectory(directoryRecord.GetString(2), sourceName); - - directories.Add(directoryRecord.GetString(1), resolvedDirectory); - } + directories.Add(directoryRecord.GetString(1), resolvedDirectory); } } -- cgit v1.2.3-55-g6feb