From 8dab66141619f7e6a541a8d4a848596e919e9593 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Thu, 9 Feb 2023 10:32:25 +0100
Subject: MDEV-30624 HeidiSQL 12.3

---
 win/packaging/heidisql.cmake  |  2 +-
 win/packaging/heidisql.wxi.in | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake
index b406e918b8f..45a407371ba 100644
--- a/win/packaging/heidisql.cmake
+++ b/win/packaging/heidisql.cmake
@@ -1,4 +1,4 @@
-SET(HEIDISQL_BASE_NAME "HeidiSQL_11.3_32_Portable")
+SET(HEIDISQL_BASE_NAME "HeidiSQL_12.3_32_Portable")
 SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip")
 SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}")
 SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME})
diff --git a/win/packaging/heidisql.wxi.in b/win/packaging/heidisql.wxi.in
index 58d95210783..831efb6971f 100644
--- a/win/packaging/heidisql.wxi.in
+++ b/win/packaging/heidisql.wxi.in
@@ -34,7 +34,6 @@
       <Shortcut Id="startmenuHeidiSQL" Directory="ShortcutFolder" Name="HeidiSQL"  Target="[D.HeidiSQL]\heidisql.exe"/>
     </Component>
 
-
     <Component Id="component.HeidiSQL_libmysql.dll" Guid="*" Win64="no">
       <File Id="heidisql.libmysql.dll" Name="libmysql.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libmysql.dll" />
     </Component>
@@ -63,6 +62,29 @@
       <File Id="heidisql.sqlite3.dll" Name="sqlite3.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\sqlite3.dll" />
     </Component>
 
+    <Component Id="component.HeidiSQL_fbclient_4.0.dll" Guid="*" Win64="no">
+      <File Id="fbclient4.0.dll" Name="fbclient-4.0.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\fbclient-4.0.dll" />
+    </Component>
+    <Component Id="component.HeidiSQL_gds32_14.1.dll" Guid="*" Win64="no">
+      <File Id="gds32_14.1.dll" Name="gds32-14.1.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\gds32-14.1.dll" />
+    </Component>
+    <Component Id="component.HeidiSQL_plink.exe" Guid="*" Win64="no">
+     <File Id="plink.exe" Name="plink.exe" Source="${HEIDISQL_DOWNLOAD_DIR}\plink.exe" />
+    </Component>
+
+    <Component Id="component.HeidiSQL_LICENSE_openssl" Guid="*" Win64="no">
+     <File Id="LICENSE_openssl" Name="LICENSE-openssl" Source="${HEIDISQL_DOWNLOAD_DIR}\LICENSE-openssl" />
+    </Component>
+
+    <?define functions_dblist=interbase;mariadb;mssql;mysql;postgresql;redshift;sqlite?>
+
+    <?foreach db in $(var.functions_dblist) ?>
+    <Component Id="component.HeidiSQL_functions_$(var.db).ini" Guid="*" Win64="no">
+     <File Id="functions_$(var.db).ini" Name="functions-$(var.db).ini"
+           Source="${HEIDISQL_DOWNLOAD_DIR}\functions-$(var.db).ini" />
+    </Component>
+    <?endforeach?>
+
     <Directory Id="D.HeidiSQL.plugins" Name="plugins">
       <?foreach dll in $(var.pluginlist) ?>
       <Component Id="component.HeidiSQL_$(var.dll)" Guid="*" Win64="no">
@@ -91,6 +113,13 @@
   <ComponentRef Id="component.HeidiSQL_libiconv_2.dll" />
   <ComponentRef Id="component.HeidiSQL_sqlite3.dll" />
   <ComponentRef Id="component.HeidiSQL_libmysql_6.1.dll" />
+  <ComponentRef Id="component.HeidiSQL_fbclient_4.0.dll" />
+  <ComponentRef Id="component.HeidiSQL_gds32_14.1.dll" />
+  <ComponentRef Id="component.HeidiSQL_plink.exe" />
+  <ComponentRef Id="component.HeidiSQL_LICENSE_openssl" />
+  <?foreach db in $(var.functions_dblist) ?>
+    <ComponentRef Id="component.HeidiSQL_functions_$(var.db).ini" />
+  <?endforeach?>
   <?foreach dll in $(var.pluginlist)?>
     <ComponentRef Id="component.HeidiSQL_$(var.dll)" />
   <?endforeach?>
-- 
cgit v1.2.1