Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Extra fixes for Mac ODBC driver #602

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions sql-odbc/docs/user/microsoft_excel_support_mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
<img src="img/excel_table_list.png" width="500">

* Edit SQL statement if required and click on **Run**. Data preview will be loaded.
> **NOTE**: Excel for Mac currently will not show an error if you provide an incorrect query ([Github issue here](https://github.com/opendistro-for-elasticsearch/sql/issues/601)). If no data appears, check your ODFE server logs to see if the query failed.

<img src="img/excel_data_preview_mac.png">

Expand Down
5 changes: 3 additions & 2 deletions sql-odbc/src/installer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ if(WIN32)
else()
set(CPACK_GENERATOR "productbuild")

# This script will be run once the Driver component has finished installing.
set(CPACK_POSTFLIGHT_DRIVER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/postinstall")

# The productbuild generator copies files from this directory
set(CPACK_PRODUCTBUILD_RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Resources")

Expand All @@ -71,8 +74,6 @@ else()
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_ROOT}/LICENSE.txt")
set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/Resources/README.txt")
set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/Resources/Welcome.txt")

set(CPACK_PACKAGING_INSTALL_PREFIX "/Library/ODBC/odfe-sql-odbc")
endif()

# Set up components for installer
Expand Down