Skip to content

Resolve ODBC Driver and Setup Registration Values #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alinaliBQ wants to merge 1 commit into from
Closed

Resolve ODBC Driver and Setup Registration Values #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/cpp_extra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,25 @@ jobs:
$dll = Join-Path $bin "arrow_flight_sql_odbc.dll"
if (Test-Path $dll) {
Write-Host "Found ODBC DLL: $dll"

# Verify ODBC driver registration values
$key = "HKLM:\SOFTWARE\ODBC\ODBCINST.INI\Apache Arrow Flight SQL ODBC Driver"
$props = Get-ItemProperty $key
foreach ($name in "Driver", "Setup") {
Write-Host "$name = '$($props.$name)'"
if ($props.$name -ne $dll) {
Write-Error "Registry value '$name' should be '$dll'"
exit 1
}
}
if ($props.DriverODBCVer -ne "03.00") {
Write-Error "Registry value 'DriverODBCVer' should be '03.00', got '$($props.DriverODBCVer)'"
exit 1
}
if ($props.UsageCount -ne 1) {
Write-Error "Registry value 'UsageCount' should be 1, got '$($props.UsageCount)'"
exit 1
}
exit 0
}
}
Expand Down
6 changes: 3 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/install/windows/arrow-flight-sql-odbc.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

<RegistryKey Root="HKLM"
Key="Software\ODBC\ODBCINST.INI\Apache Arrow Flight SQL ODBC Driver">
<!-- CM_FP_arrow_flight_sql_odbc.bin.arrow_flight_sql_odbc.dll is a generated variable value from build\_CPack_Packages\win64\WIX\files.wxs -->
<!-- CM_FP_ArrowFlightSQLODBC.bin.arrow_flight_sql_odbc.dll is a generated variable value from build\_CPack_Packages\win64\WIX\files.wxs -->
<RegistryValue Type="string" Name="DriverODBCVer" Value="03.00"/>
<RegistryValue Type="string" Name="Driver" Value="[#CM_FP_arrow_flight_sql_odbc.bin.arrow_flight_sql_odbc.dll]"/>
<RegistryValue Type="string" Name="Setup" Value="[#CM_FP_arrow_flight_sql_odbc.bin.arrow_flight_sql_odbc.dll]"/>
<RegistryValue Type="string" Name="Driver" Value="[#CM_FP_ArrowFlightSQLODBC.bin.arrow_flight_sql_odbc.dll]"/>
<RegistryValue Type="string" Name="Setup" Value="[#CM_FP_ArrowFlightSQLODBC.bin.arrow_flight_sql_odbc.dll]"/>
<RegistryValue Type="integer" Name="UsageCount" Value="1"/>
</RegistryKey>
</Component>
Expand Down
Loading