From 64ef60e2eb70115442d64d22a7ee2568bba058f1 Mon Sep 17 00:00:00 2001
From: Anshu6250 <anshu@37848692.corp-partner.google.com>
Date: Wed, 9 Sep 2026 13:32:04 +0530
Subject: [PATCH 1/2] test: upgrading issue fix

---
 ci/installer/ODBCDriverForBigQuery/Components.wsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/installer/ODBCDriverForBigQuery/Components.wsx b/ci/installer/ODBCDriverForBigQuery/Components.wsx
index 61bec894fa..ecb5a40927 100644
--- a/ci/installer/ODBCDriverForBigQuery/Components.wsx
+++ b/ci/installer/ODBCDriverForBigQuery/Components.wsx
@@ -42,7 +42,7 @@ limitations under the License.
               Return="ignore"/>
 
 <InstallExecuteSequence>
-  <Custom Action="RemoveAllDriverDSNs" Before="RemoveFiles">REMOVE="ALL"</Custom>
+  <Custom Action="RemoveAllDriverDSNs" Before="RemoveFiles">REMOVE="ALL" AND NOT WIX_UPGRADE_DETECTED</Custom>
 </InstallExecuteSequence>
         <DirectoryRef Id="INSTALLFOLDER" FileSource="..\files\$(var.Platform)\Release">
 

From 020eaf8a96c27dde6cd69620afbaf3be78061dfc Mon Sep 17 00:00:00 2001
From: Anshu6250 <anshu@37848692.corp-partner.google.com>
Date: Wed, 9 Sep 2026 22:35:26 +0530
Subject: [PATCH 2/2] test

---
 ci/installer/ODBCDriverForBigQuery/Components.wsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/installer/ODBCDriverForBigQuery/Components.wsx b/ci/installer/ODBCDriverForBigQuery/Components.wsx
index ecb5a40927..f3864cd2c4 100644
--- a/ci/installer/ODBCDriverForBigQuery/Components.wsx
+++ b/ci/installer/ODBCDriverForBigQuery/Components.wsx
@@ -42,12 +42,12 @@ limitations under the License.
               Return="ignore"/>
 
 <InstallExecuteSequence>
-  <Custom Action="RemoveAllDriverDSNs" Before="RemoveFiles">REMOVE="ALL" AND NOT WIX_UPGRADE_DETECTED</Custom>
+  <Custom Action="RemoveAllDriverDSNs" Before="RemoveFiles">REMOVE="ALL" AND NOT UPGRADINGPRODUCTCODE</Custom>
 </InstallExecuteSequence>
         <DirectoryRef Id="INSTALLFOLDER" FileSource="..\files\$(var.Platform)\Release">
 
             <!-- Combined Driver Files Component -->
-            <Component Id="DriverFilesComponent" Guid="0b6e6271-38da-4c8c-8897-f675ff1e702d">
+            <Component Id="DriverFilesComponent" Guid="*">
                 <File Id="google_cloud_odbc_bq_driver.dll" Name="google_cloud_odbc_bq_driver.dll" />
             </Component>