Skip to content

Remove built-in PowerBI driver settings #572

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

Merged
slabko merged 2 commits into from
Jul 6, 2026
Merged

Remove built-in PowerBI driver settings #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3de81b9
Revert "Fix driver packaging for Power BI"
slabko Jul 3, 2026
055c413
Revert "Add a Separate Build for Power BI"
slabko Jul 3, 2026
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
170 changes: 0 additions & 170 deletions .github/workflows/WindowsSigningPowerBI.yml
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ option (CH_ODBC_THIRD_PARTY_LINK_STATIC "Link with third party libraries statica
set (CH_ODBC_DEFAULT_DSN_ANSI "ClickHouse DSN (ANSI)" CACHE STRING "Default ANSI DSN name")
set (CH_ODBC_DEFAULT_DSN_UNICODE "ClickHouse DSN (Unicode)" CACHE STRING "Default Unicode DSN name")

set (CH_ODBC_VERSION_SUFFIX "" CACHE STRING "Project version (e.g. `-powerbi`)")
option (CH_ODBC_DEFAULT_SQL_COMPATIBILITY_SETTINGS "Enable SqlCompatibilitySettings by default" OFF)

if (MSVC)
# This default encoding mode will be overriden by UNICODE, in the corresponding cases.
#add_compile_definitions (SBCS _SBCS)
Expand All @@ -96,9 +93,6 @@ else()
link_libraries(global-group)
endif()

if (CH_ODBC_DEFAULT_SQL_COMPATIBILITY_SETTINGS)
add_compile_definitions(SQL_COMPATIBILITY_SETTINGS_BY_DEFAULT)
endif ()

# Make sure that all optimized builds have NDEBUG macro set.
foreach (config Release RelWithDebInfo MinSizeRel)
Expand Down Expand Up @@ -307,18 +301,6 @@ if (CH_ODBC_ENABLE_INSTALL)

set (CPACK_PROJECT_CONFIG_FILE "${PROJECT_SOURCE_DIR}/CPackLists.txt")

# CPACK_SYSTEM_NAME does not work because cpack is not included yet, including it in advance
# brings another set of problems that are not worth fixing at the moment
set (CH_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}")
if (CH_SYSTEM_NAME MATCHES "Windows")
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set (CH_SYSTEM_NAME "win64")
else ()
set (CH_SYSTEM_NAME "win32")
endif ()
endif ()
set (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}${CH_ODBC_VERSION_SUFFIX}-${CH_SYSTEM_NAME}")

set (CPACK_PACKAGE_VENDOR "ClickHouse, Inc.")
set (CPACK_PACKAGE_DESCRIPTION "The official ODBC driver implementation for accessing ClickHouse as a data source.")
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "ClickHouse ODBC Driver (${ARCH_BITS}-bit)")
Expand Down
6 changes: 1 addition & 5 deletions driver/config/ini_defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@
#define INI_AUTO_SESSION_ID_DEFAULT "off"
#define INI_CLIENT_NAME_DEFAULT ""
#define INI_COMPRESSION_DEFAULT "1"
#ifdef SQL_COMPATIBILITY_SETTINGS_BY_DEFAULT
# define INI_SQL_COMPATIBILITY_SETTINGS_DEFAULT "1"
#else
# define INI_SQL_COMPATIBILITY_SETTINGS_DEFAULT "0"
#endif
#define INI_SQL_COMPATIBILITY_SETTINGS_DEFAULT "0"

#ifdef NDEBUG
# define INI_DRIVERLOG_DEFAULT "off"
Expand Down
8 changes: 1 addition & 7 deletions driver/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
#include <memory>
#include <mutex>

#ifdef SQL_COMPATIBILITY_SETTINGS_BY_DEFAULT
static constexpr bool sql_compatibility_settings_default = true;
#else
static constexpr bool sql_compatibility_settings_default = false;
#endif

class DescriptorRecord;
class Descriptor;
class Statement;
Expand Down Expand Up @@ -50,7 +44,7 @@ class Connection
bool auto_session_id = false;
std::string client_name;
bool enable_http_compression = true;
bool sql_compatibility_settings = sql_compatibility_settings_default;
bool sql_compatibility_settings = false;

public:
std::unique_ptr<Poco::Net::HTTPClientSession> session;
Expand Down
2 changes: 1 addition & 1 deletion driver/platform/config_cmake.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define VERSION_PATCH @PROJECT_VERSION_PATCH@
#define VERSION_TWEAK @PROJECT_VERSION_TWEAK@
#define VERSION_EXTRA ""
#define VERSION_STRING "@PROJECT_VERSION@@CH_ODBC_VERSION_SUFFIX@"
#define VERSION_STRING "@PROJECT_VERSION@"

#define SYSTEM_STRING "@CMAKE_SYSTEM@"
#define ODBC_PROVIDER "@ODBC_PROVIDER@"
Expand Down
Loading