From 1f79d68388915013c21e68b447a54f2bdbc8a2bb Mon Sep 17 00:00:00 2001 From: Chen Dai Date: Mon, 17 May 2021 11:42:02 -0700 Subject: [PATCH 1/6] Replace opendistro Signed-off-by: Chen Dai --- sql-odbc/docs/dev/Pagination.md | 2 +- sql-odbc/src/odfesqlodbc/opensearch_communication.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql-odbc/docs/dev/Pagination.md b/sql-odbc/docs/dev/Pagination.md index 4e82d534802..ff2a862f671 100644 --- a/sql-odbc/docs/dev/Pagination.md +++ b/sql-odbc/docs/dev/Pagination.md @@ -3,7 +3,7 @@ ## Overview OpenSearch ODBC Driver supports forward-only cursor. This document illustrates how the cursor(pagination) is handled in the driver. -For information on how the pagination is supported on OpenSearch server, check [Opendistro SQL Cursor (Pagination) Support](https://github.com/opensearch-project/sql/blob/main/docs/dev/Pagination.md). +For information on how the pagination is supported on OpenSearch server, check [OpenSearch SQL Cursor (Pagination) Support](https://github.com/opensearch-project/sql/blob/main/docs/dev/Pagination.md). ## Data Flow

diff --git a/sql-odbc/src/odfesqlodbc/opensearch_communication.cpp b/sql-odbc/src/odfesqlodbc/opensearch_communication.cpp index cb23351e0a4..a481fb3cc1f 100644 --- a/sql-odbc/src/odfesqlodbc/opensearch_communication.cpp +++ b/sql-odbc/src/odfesqlodbc/opensearch_communication.cpp @@ -47,7 +47,7 @@ static const std::string SQL_ENDPOINT_FORMAT_JDBC = static const std::string SQL_ENDPOINT_CLOSE_CURSOR = "/_opensearch/_sql/close"; static const std::string PLUGIN_ENDPOINT_FORMAT_JSON = "/_cat/plugins?format=json"; -static const std::string OPENDISTRO_SQL_PLUGIN_NAME = "opensearch-sql"; +static const std::string OPENSEARCH_SQL_PLUGIN_NAME = "opensearch-sql"; static const std::string ALLOCATION_TAG = "AWS_SIGV4_AUTH"; static const std::string SERVICE_NAME = "es"; static const std::string ESODBC_PROFILE_NAME = "opensearchodbc"; @@ -442,7 +442,7 @@ bool OpenSearchCommunication::IsSQLPluginInstalled(const std::string& plugin_res for (auto it : plugin_array) { if (it.has("component") && it.has("version")) { std::string plugin_name = it.at("component").as_string(); - if (!plugin_name.compare(OPENDISTRO_SQL_PLUGIN_NAME)) { + if (!plugin_name.compare(OPENSEARCH_SQL_PLUGIN_NAME)) { std::string sql_plugin_version = it.at("version").as_string(); LogMsg(OPENSEARCH_INFO, std::string("Found SQL plugin version '" From 49d700d4e1175cb496231a400138f7c1dc6c4782 Mon Sep 17 00:00:00 2001 From: Chen Dai Date: Mon, 17 May 2021 16:00:43 -0700 Subject: [PATCH 2/6] Rename lib name to libsqlodbc Signed-off-by: Chen Dai --- sql-odbc/README.md | 2 +- sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md | 2 +- sql-odbc/docs/user/mac_configure_dsn.md | 10 +++++----- sql-odbc/src/DSNInstaller/dsn_installer.cpp | 2 +- .../IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini | 4 ++-- .../ITODBCConnection/test_odbcinst.ini | 4 ++-- .../src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp | 2 +- sql-odbc/src/odfesqlodbc/opensearch_odbc.h | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sql-odbc/README.md b/sql-odbc/README.md index 69fd9c8638b..b707270e8a8 100644 --- a/sql-odbc/README.md +++ b/sql-odbc/README.md @@ -49,7 +49,7 @@ This will customize the connection from Tableau to OpenSearch, ensuring that the The driver comes in the form of a library file: * Windows: `odfesqlodbc.dll` -* Mac: `libodfesqlodbc.dylib` +* Mac: `libsqlodbc.dylib` If using with ODBC compatible BI tools, refer to the tool documentation on configuring a new ODBC driver. In most cases, you will need to make the tool aware of the location of the driver library file and then use it to setup OpenSearch database connections. diff --git a/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md b/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md index 16c642c633c..56d682d1b80 100644 --- a/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md +++ b/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md @@ -84,7 +84,7 @@ build └-- ``` -* Driver library: `./build/odbc/lib/libodfesqlodbc.dylib` +* Driver library: `./build/odbc/lib/libsqlodbc.dylib` * Test binaries folder: `./build/odbc/bin/` ### Packaging diff --git a/sql-odbc/docs/user/mac_configure_dsn.md b/sql-odbc/docs/user/mac_configure_dsn.md index 30414ccac59..10c82d3e241 100644 --- a/sql-odbc/docs/user/mac_configure_dsn.md +++ b/sql-odbc/docs/user/mac_configure_dsn.md @@ -12,8 +12,8 @@ Note: In order to use the OpenSearch SQL ODBC driver with the [Tableau Connector 1. Go to the **ODBC Drivers** tab. 2. Click **Add a Driver**. * **Description of the Driver**: The driver name used for ODBC connections (ex. `OpenSearch SQL ODBC Driver`) - * **Driver File Name**: The path to the driver file (default installed path: `/Library/ODBC/opensearch-sql-odbc/bin/libodfesqlodbc.dylib`) - * **Setup File Name**: The path to the driver file (default installed path: `/Library/ODBC/opensearch-sql-odbc/bin/libodfesqlodbc.dylib`) + * **Driver File Name**: The path to the driver file (default installed path: `/Library/ODBC/opensearch-sql-odbc/bin/libsqlodbc.dylib`) + * **Setup File Name**: The path to the driver file (default installed path: `/Library/ODBC/opensearch-sql-odbc/bin/libsqlodbc.dylib`) * Set as a **User** driver * Below is a screenshot of how the final screen should look. 3. Click **OK** to save the options. @@ -53,8 +53,8 @@ Try the following: = Installed [] - Driver = /lib64/libodfesqlodbc.dylib - Setup = /lib64/libodfesqlodbc.dylib + Driver = /lib64/libsqlodbc.dylib + Setup = /lib64/libsqlodbc.dylib ``` * **odbc.ini** (will be found in **User DSNs**) ```ini @@ -62,7 +62,7 @@ Try the following: = [] - Driver = /lib64/libodfesqlodbc.dylib + Driver = /lib64/libsqlodbc.dylib Description = Host = localhost Port = 9200 diff --git a/sql-odbc/src/DSNInstaller/dsn_installer.cpp b/sql-odbc/src/DSNInstaller/dsn_installer.cpp index 6551cab90f1..d2cc8e96b57 100644 --- a/sql-odbc/src/DSNInstaller/dsn_installer.cpp +++ b/sql-odbc/src/DSNInstaller/dsn_installer.cpp @@ -40,7 +40,7 @@ using namespace std::string_literals; std::wstring driver_name = L"OpenSearch SQL ODBC Driver"; -std::wstring driver_filename = L"libodfesqlodbc.dylib"; +std::wstring driver_filename = L"libsqlodbc.dylib"; std::wstring dsn_name = L"OpenSearch SQL ODBC DSN"; std::wstring dsn_ini_filename = L"odfesqlodbc.ini"; diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini index 03aedf8bb1b..bb43dd526e8 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini +++ b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini @@ -2,5 +2,5 @@ OpenSearchODBC = Installed [OpenSearchODBC] -Driver = /lib64/libodfesqlodbc.dylib -Setup = /lib64/libodfesqlodbc.dylib \ No newline at end of file +Driver = /lib64/libsqlodbc.dylib +Setup = /lib64/libsqlodbc.dylib \ No newline at end of file diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini index 9868d27e066..9b0084a4b17 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini +++ b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini @@ -2,8 +2,8 @@ OpenSearchODBC = Installed [OpenSearchODBC] -Driver = /lib64/libodfesqlodbc.dylib -Setup = /lib64/libodfesqlodbc.dylib +Driver = /lib64/libsqlodbc.dylib +Setup = /lib64/libsqlodbc.dylib [OpenSearch Unicode] logOutput = C:\ diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp b/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp index 0f08433e0cf..de88b570c5a 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp +++ b/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp @@ -151,7 +151,7 @@ int Ver1GEVer2(std::wstring ver_1_str, std::wstring ver_2_str) { #if defined(WIN32) TEST_SQL_GET_INFO_STRING(SQLDriverName, SQL_DRIVER_NAME, L"odfesqlodbc.dll"); #elif defined(__APPLE__) -TEST_SQL_GET_INFO_STRING(SQLDriverName, SQL_DRIVER_NAME, L"libodfesqlodbc.dylib"); +TEST_SQL_GET_INFO_STRING(SQLDriverName, SQL_DRIVER_NAME, L"libsqlodbc.dylib"); #endif TEST_SQL_GET_INFO_STRING(SQLDriverODBCVer, SQL_DRIVER_ODBC_VER, L"03.51"); diff --git a/sql-odbc/src/odfesqlodbc/opensearch_odbc.h b/sql-odbc/src/odfesqlodbc/opensearch_odbc.h index 68bd9b8c663..c2a4c5117f1 100644 --- a/sql-odbc/src/odfesqlodbc/opensearch_odbc.h +++ b/sql-odbc/src/odfesqlodbc/opensearch_odbc.h @@ -383,9 +383,9 @@ SQLULEN ucs2strlen(const SQLWCHAR *); #endif /* UNICODE_SUPPORT */ #else #ifdef UNICODE_SUPPORT -#define DRIVER_FILE_NAME "libodfesqlodbc.dylib" +#define DRIVER_FILE_NAME "libsqlodbc.dylib" #else -#define DRIVER_FILE_NAME "libodfesqlodbc.dylib" +#define DRIVER_FILE_NAME "libsqlodbc.dylib" #endif #endif /* WIN32 */ BOOL isMsAccess(void); From 5d072970550bc5193685c3d58830d240b07eb496 Mon Sep 17 00:00:00 2001 From: Chen Dai Date: Mon, 17 May 2021 16:20:12 -0700 Subject: [PATCH 3/6] Rename dll name to sqlodbc Signed-off-by: Chen Dai --- sql-odbc/README.md | 2 +- sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md | 2 +- .../IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg | 4 ++-- sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg | 4 ++-- sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp | 2 +- sql-odbc/src/installer/patch.xml | 6 +++--- sql-odbc/src/odfesqlodbc/opensearch_odbc.h | 4 ++-- sql-odbc/src/odfesqlodbc/opensearch_odbc.rc | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sql-odbc/README.md b/sql-odbc/README.md index b707270e8a8..c281f5eaa01 100644 --- a/sql-odbc/README.md +++ b/sql-odbc/README.md @@ -48,7 +48,7 @@ This will customize the connection from Tableau to OpenSearch, ensuring that the ## Using the Driver The driver comes in the form of a library file: -* Windows: `odfesqlodbc.dll` +* Windows: `sqlodbc.dll` * Mac: `libsqlodbc.dylib` If using with ODBC compatible BI tools, refer to the tool documentation on configuring a new ODBC driver. In most cases, you will need to make the tool aware of the location of the driver library file and then use it to setup OpenSearch database connections. diff --git a/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md b/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md index 56d682d1b80..dfd3d771e0c 100644 --- a/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md +++ b/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md @@ -40,7 +40,7 @@ build └-- install ``` -* Driver DLL: `.\build\odbc\bin\\odfesqlodbc.dll` +* Driver DLL: `.\build\odbc\bin\\sqlodbc.dll` * Test binaries folder: `.\build\odbc\bin\\` ### Packaging diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg index 872dec2d3a5..10bd4bee496 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg +++ b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg @@ -4,8 +4,8 @@ Windows Registry Editor Version 5.00 "OpenSearchODBC"="Installed" [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\OpenSearchODBC] -"Driver"="\\bin64\\Release\\odfesqlodbc.dll" -"Setup"="\\bin64\\Release\\odfesqlodbc.dll" +"Driver"="\\bin64\\Release\\sqlodbc.dll" +"Setup"="\\bin64\\Release\\sqlodbc.dll" [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\ODBC Data Sources] "test_aws_auth_dsn"="OpenSearchODBC" diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg index cfdfffaa7ed..5fbdc93f427 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg +++ b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg @@ -4,8 +4,8 @@ Windows Registry Editor Version 5.00 "OpenSearchODBC"="Installed" [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\OpenSearchODBC] -"Driver"="\\bin64\\Release\\odfesqlodbc.dll" -"Setup"="\\bin64\\Release\\odfesqlodbc.dll" +"Driver"="\\bin64\\Release\\sqlodbc.dll" +"Setup"="\\bin64\\Release\\sqlodbc.dll" [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\ODBC Data Sources] "test_dsn"="OpenSearchODBC" diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp b/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp index de88b570c5a..fd8379d4fe3 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp +++ b/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp @@ -149,7 +149,7 @@ int Ver1GEVer2(std::wstring ver_1_str, std::wstring ver_2_str) { ///////////////// #if defined(WIN32) -TEST_SQL_GET_INFO_STRING(SQLDriverName, SQL_DRIVER_NAME, L"odfesqlodbc.dll"); +TEST_SQL_GET_INFO_STRING(SQLDriverName, SQL_DRIVER_NAME, L"sqlodbc.dll"); #elif defined(__APPLE__) TEST_SQL_GET_INFO_STRING(SQLDriverName, SQL_DRIVER_NAME, L"libsqlodbc.dylib"); #endif diff --git a/sql-odbc/src/installer/patch.xml b/sql-odbc/src/installer/patch.xml index b334963aec6..869b624ab5e 100644 --- a/sql-odbc/src/installer/patch.xml +++ b/sql-odbc/src/installer/patch.xml @@ -1,5 +1,5 @@ - + @@ -14,8 +14,8 @@ - - + + diff --git a/sql-odbc/src/odfesqlodbc/opensearch_odbc.h b/sql-odbc/src/odfesqlodbc/opensearch_odbc.h index c2a4c5117f1..1279267c921 100644 --- a/sql-odbc/src/odfesqlodbc/opensearch_odbc.h +++ b/sql-odbc/src/odfesqlodbc/opensearch_odbc.h @@ -377,9 +377,9 @@ SQLULEN ucs2strlen(const SQLWCHAR *); #endif /* DBMS_NAME */ #ifdef WIN32 #ifdef UNICODE_SUPPORT -#define DRIVER_FILE_NAME "odfesqlodbc.dll" +#define DRIVER_FILE_NAME "sqlodbc.dll" #else -#define DRIVER_FILE_NAME "odfesqlodbc.dll" +#define DRIVER_FILE_NAME "sqlodbc.dll" #endif /* UNICODE_SUPPORT */ #else #ifdef UNICODE_SUPPORT diff --git a/sql-odbc/src/odfesqlodbc/opensearch_odbc.rc b/sql-odbc/src/odfesqlodbc/opensearch_odbc.rc index d2e2c0c931e..e303b0764b7 100644 --- a/sql-odbc/src/odfesqlodbc/opensearch_odbc.rc +++ b/sql-odbc/src/odfesqlodbc/opensearch_odbc.rc @@ -187,7 +187,7 @@ BEGIN VALUE "InternalName", "odfesqlodbc" VALUE "LegalCopyright", "Copyright" VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoft? is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation." - VALUE "OriginalFilename", "odfesqlodbc.dll" + VALUE "OriginalFilename", "sqlodbc.dll" VALUE "ProductName", "OpenSearch" VALUE "ProductVersion", OPENSEARCH_ODBC_VERSION END From bc67232ba5ba46e0fd47a8dcd7eb07d3a1a8e97d Mon Sep 17 00:00:00 2001 From: Chen Dai Date: Mon, 17 May 2021 16:38:47 -0700 Subject: [PATCH 4/6] Replace all odfesqlodbc Signed-off-by: Chen Dai --- sql-odbc/.gitignore | 2 +- sql-odbc/docs/user/power_bi_support.md | 6 +++--- sql-odbc/src/CMakeLists.txt | 2 +- sql-odbc/src/DSNInstaller/dsn_installer.cpp | 2 +- .../ITODBCAwsAuth/CMakeLists.txt | 2 +- .../ITODBCCatalog/CMakeLists.txt | 2 +- .../ITODBCConnection/CMakeLists.txt | 2 +- .../ITODBCDescriptors/CMakeLists.txt | 2 +- .../ITODBCExecution/CMakeLists.txt | 2 +- .../ITODBCHelper/CMakeLists.txt | 2 +- .../ITODBCInfo/CMakeLists.txt | 2 +- .../ITODBCPagination/CMakeLists.txt | 2 +- .../ITODBCResults/CMakeLists.txt | 2 +- .../ITODBCTableauQueries/CMakeLists.txt | 2 +- .../PTODBCExecution/CMakeLists.txt | 2 +- .../PTODBCInfo/CMakeLists.txt | 2 +- .../PTODBCResults/CMakeLists.txt | 2 +- .../PBIDSExamples/odfesqlodbc_import.pbids | 2 +- ...nector.mproj => SqlOdbcPBIConnector.mproj} | 0 ...PBIConnector.pq => SqlOdbcPBIConnector.pq} | 4 ++-- ....query.pq => SqlOdbcPBIConnector.query.pq} | 0 ...nector16.png => SqlOdbcPBIConnector16.png} | Bin ...nector20.png => SqlOdbcPBIConnector20.png} | Bin ...nector24.png => SqlOdbcPBIConnector24.png} | Bin ...nector32.png => SqlOdbcPBIConnector32.png} | Bin ...nector40.png => SqlOdbcPBIConnector40.png} | Bin ...nector48.png => SqlOdbcPBIConnector48.png} | Bin ...nector64.png => SqlOdbcPBIConnector64.png} | Bin ...nector80.png => SqlOdbcPBIConnector80.png} | Bin sql-odbc/src/UnitTests/UTConn/CMakeLists.txt | 2 +- .../UTCriticalSection/CMakeLists.txt | 2 +- .../src/UnitTests/UTHelper/CMakeLists.txt | 2 +- sql-odbc/src/installer/CMakeLists.txt | 2 +- .../{odfesqlodbc => sqlodbc}/CMakeLists.txt | 18 +++++++++--------- sql-odbc/src/{odfesqlodbc => sqlodbc}/bind.c | 0 sql-odbc/src/{odfesqlodbc => sqlodbc}/bind.h | 0 .../src/{odfesqlodbc => sqlodbc}/catfunc.h | 0 .../src/{odfesqlodbc => sqlodbc}/columninfo.c | 0 .../src/{odfesqlodbc => sqlodbc}/columninfo.h | 0 .../src/{odfesqlodbc => sqlodbc}/connection.c | 0 .../src/{odfesqlodbc => sqlodbc}/convert.c | 0 .../src/{odfesqlodbc => sqlodbc}/convert.h | 0 .../src/{odfesqlodbc => sqlodbc}/descriptor.c | 0 .../src/{odfesqlodbc => sqlodbc}/descriptor.h | 0 .../{odfesqlodbc => sqlodbc}/dlg_specific.c | 0 .../{odfesqlodbc => sqlodbc}/dlg_specific.h | 0 .../src/{odfesqlodbc => sqlodbc}/dlg_wingui.c | 0 .../src/{odfesqlodbc => sqlodbc}/drvconn.c | 0 .../src/{odfesqlodbc => sqlodbc}/drvconn.h | 0 .../src/{odfesqlodbc => sqlodbc}/environ.c | 0 .../src/{odfesqlodbc => sqlodbc}/environ.h | 0 .../src/{odfesqlodbc => sqlodbc}/execute.c | 0 sql-odbc/src/{odfesqlodbc => sqlodbc}/info.c | 0 .../src/{odfesqlodbc => sqlodbc}/loadlib.c | 8 ++++---- .../src/{odfesqlodbc => sqlodbc}/loadlib.h | 0 sql-odbc/src/{odfesqlodbc => sqlodbc}/misc.c | 0 sql-odbc/src/{odfesqlodbc => sqlodbc}/misc.h | 0 .../src/{odfesqlodbc => sqlodbc}/multibyte.c | 0 .../src/{odfesqlodbc => sqlodbc}/multibyte.h | 0 sql-odbc/src/{odfesqlodbc => sqlodbc}/mylog.c | 0 sql-odbc/src/{odfesqlodbc => sqlodbc}/mylog.h | 0 .../src/{odfesqlodbc => sqlodbc}/odbcapi.c | 0 .../src/{odfesqlodbc => sqlodbc}/odbcapi30.c | 0 .../src/{odfesqlodbc => sqlodbc}/odbcapi30w.c | 0 .../src/{odfesqlodbc => sqlodbc}/odbcapiw.c | 0 .../opensearch_api30.c | 0 .../opensearch_apifunc.h | 0 .../opensearch_communication.cpp | 2 +- .../opensearch_communication.h | 0 .../opensearch_connection.cpp | 0 .../opensearch_connection.h | 0 .../opensearch_driver_connect.cpp | 0 .../opensearch_driver_connect.h | 0 .../opensearch_helper.cpp | 0 .../opensearch_helper.h | 0 .../opensearch_info.cpp | 0 .../opensearch_info.h | 0 .../opensearch_odbc.c | 0 .../opensearch_odbc.h | 0 .../opensearch_odbc.rc | 2 +- .../opensearch_parse_result.cpp | 0 .../opensearch_parse_result.h | 0 .../opensearch_result_queue.cpp | 0 .../opensearch_result_queue.h | 0 .../opensearch_semaphore.cpp | 0 .../opensearch_semaphore.h | 0 .../opensearch_statement.cpp | 0 .../opensearch_statement.h | 0 .../opensearch_types.c | 0 .../opensearch_types.h | 0 .../opensearch_utility.cpp | 0 .../opensearch_utility.h | 0 .../src/{odfesqlodbc => sqlodbc}/options.c | 0 sql-odbc/src/{odfesqlodbc => sqlodbc}/parse.c | 0 .../src/{odfesqlodbc => sqlodbc}/qresult.c | 0 .../src/{odfesqlodbc => sqlodbc}/qresult.h | 0 .../src/{odfesqlodbc => sqlodbc}/resource.h | 0 .../src/{odfesqlodbc => sqlodbc}/results.c | 0 sql-odbc/src/{odfesqlodbc => sqlodbc}/setup.c | 0 .../src/{odfesqlodbc => sqlodbc}/statement.c | 0 .../src/{odfesqlodbc => sqlodbc}/statement.h | 0 sql-odbc/src/{odfesqlodbc => sqlodbc}/tuple.c | 0 sql-odbc/src/{odfesqlodbc => sqlodbc}/tuple.h | 0 .../unicode_support.h | 0 .../src/{odfesqlodbc => sqlodbc}/version.h | 0 .../src/{odfesqlodbc => sqlodbc}/win_setup.h | 0 .../{odfesqlodbc => sqlodbc}/win_unicode.c | 0 107 files changed, 41 insertions(+), 41 deletions(-) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector.mproj => SqlOdbcPBIConnector.mproj} (100%) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector.pq => SqlOdbcPBIConnector.pq} (99%) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector.query.pq => SqlOdbcPBIConnector.query.pq} (100%) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector16.png => SqlOdbcPBIConnector16.png} (100%) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector20.png => SqlOdbcPBIConnector20.png} (100%) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector24.png => SqlOdbcPBIConnector24.png} (100%) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector32.png => SqlOdbcPBIConnector32.png} (100%) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector40.png => SqlOdbcPBIConnector40.png} (100%) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector48.png => SqlOdbcPBIConnector48.png} (100%) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector64.png => SqlOdbcPBIConnector64.png} (100%) rename sql-odbc/src/PowerBIConnector/{OdfeSqlOdbcPBIConnector80.png => SqlOdbcPBIConnector80.png} (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/CMakeLists.txt (81%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/bind.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/bind.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/catfunc.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/columninfo.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/columninfo.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/connection.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/convert.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/convert.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/descriptor.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/descriptor.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/dlg_specific.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/dlg_specific.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/dlg_wingui.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/drvconn.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/drvconn.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/environ.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/environ.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/execute.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/info.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/loadlib.c (98%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/loadlib.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/misc.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/misc.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/multibyte.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/multibyte.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/mylog.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/mylog.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/odbcapi.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/odbcapi30.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/odbcapi30w.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/odbcapiw.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_api30.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_apifunc.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_communication.cpp (99%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_communication.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_connection.cpp (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_connection.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_driver_connect.cpp (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_driver_connect.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_helper.cpp (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_helper.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_info.cpp (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_info.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_odbc.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_odbc.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_odbc.rc (99%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_parse_result.cpp (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_parse_result.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_result_queue.cpp (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_result_queue.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_semaphore.cpp (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_semaphore.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_statement.cpp (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_statement.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_types.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_types.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_utility.cpp (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/opensearch_utility.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/options.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/parse.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/qresult.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/qresult.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/resource.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/results.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/setup.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/statement.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/statement.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/tuple.c (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/tuple.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/unicode_support.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/version.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/win_setup.h (100%) rename sql-odbc/src/{odfesqlodbc => sqlodbc}/win_unicode.c (100%) diff --git a/sql-odbc/.gitignore b/sql-odbc/.gitignore index 6f408e7c21a..0ca253ba17d 100644 --- a/sql-odbc/.gitignore +++ b/sql-odbc/.gitignore @@ -43,7 +43,7 @@ LICENSE.txt /installer/ /IntegrationTests/ /odfeenlist/ -/odfesqlodbc/ +/sqlodbc/ /PerformanceTests/ /UnitTests/ *.filters diff --git a/sql-odbc/docs/user/power_bi_support.md b/sql-odbc/docs/user/power_bi_support.md index 66c9e647b14..77709691de9 100644 --- a/sql-odbc/docs/user/power_bi_support.md +++ b/sql-odbc/docs/user/power_bi_support.md @@ -5,7 +5,7 @@ * [OpenSearch](https://opendistro.github.io/for-elasticsearch-docs/docs/install/) * [OpenSearch SQL ODBC driver](https://opendistro.github.io/for-elasticsearch-docs/docs/sql/odbc/) * [OdfeSqlOdbcPBIConnector.mez](../../src/PowerBIConnector/bin/Release/) -* Optional: [odfesqlodbc_import.pbids](../../src/PowerBIConnector/PBIDSExamples) to help with repeated connections to the same server +* Optional: [sqlodbc_import.pbids](../../src/PowerBIConnector/PBIDSExamples) to help with repeated connections to the same server ## Setup * Copy `OdfeSqlOdbcPBIConnector.mez` file in the `\Documents\Power BI Desktop\Custom Connectors\` folder. This will let Power BI access custom connector. @@ -56,14 +56,14 @@ More info: https://docs.microsoft.com/en-us/power-bi/connect-data/desktop-data-sources#using-pbids-files-to-get-data -Example PBIDS file for OpenSearch: (available here: [odfesqlodbc_import.pbids](../../src/PowerBIConnector/PBIDSExamples/odfesqlodbc_import.pbids)) +Example PBIDS file for OpenSearch: (available here: [sqlodbc_import.pbids](../../src/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids)) ```json { "version": "0.1", "connections": [ { "details": { - "protocol": "odfesqlodbc", + "protocol": "sqlodbc", "address": { "server": "localhost:9200" } diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt index 6d5dd80a920..46712566a1c 100644 --- a/sql-odbc/src/CMakeLists.txt +++ b/sql-odbc/src/CMakeLists.txt @@ -78,7 +78,7 @@ endif() # Base directories set(PROJECT_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/..") -set(ODFEODBC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/odfesqlodbc") +set(ODFEODBC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/sqlodbc") set(ODFEENLIST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/odfeenlist") set(INTEGRATION_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/IntegrationTests") set(UNIT_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/UnitTests") diff --git a/sql-odbc/src/DSNInstaller/dsn_installer.cpp b/sql-odbc/src/DSNInstaller/dsn_installer.cpp index d2cc8e96b57..50942fcb6b7 100644 --- a/sql-odbc/src/DSNInstaller/dsn_installer.cpp +++ b/sql-odbc/src/DSNInstaller/dsn_installer.cpp @@ -42,7 +42,7 @@ using namespace std::string_literals; std::wstring driver_name = L"OpenSearch SQL ODBC Driver"; std::wstring driver_filename = L"libsqlodbc.dylib"; std::wstring dsn_name = L"OpenSearch SQL ODBC DSN"; -std::wstring dsn_ini_filename = L"odfesqlodbc.ini"; +std::wstring dsn_ini_filename = L"sqlodbc.ini"; std::wstring driver_name_placeholder = L"%DRIVER_NAME%"; std::wstring driver_path_placeholder = L"%DRIVER_PATH%"; diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt index 142ae68c1f1..56c66c96b19 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt @@ -37,5 +37,5 @@ include_directories( ${UT_HELPER} add_executable(itodbc_aws_auth ${SOURCE_FILES}) # Library dependencies -target_link_libraries(itodbc_aws_auth odfesqlodbc itodbc_helper ut_helper gtest_main aws-cpp-sdk-core) +target_link_libraries(itodbc_aws_auth sqlodbc itodbc_helper ut_helper gtest_main aws-cpp-sdk-core) target_compile_definitions(itodbc_aws_auth PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt index c4beeb2aa05..f5f1039f570 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt @@ -36,5 +36,5 @@ add_executable(itodbc_catalog ${SOURCE_FILES}) # Library dependencies target_code_coverage(itodbc_catalog PUBLIC AUTO ALL) -target_link_libraries(itodbc_catalog odfesqlodbc itodbc_helper ut_helper gtest_main) +target_link_libraries(itodbc_catalog sqlodbc itodbc_helper ut_helper gtest_main) target_compile_definitions(itodbc_catalog PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt index 69b8b74fc7e..3d0ef5086dd 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt @@ -36,6 +36,6 @@ add_executable(itodbc_connection ${SOURCE_FILES}) # Library dependencies target_code_coverage(itodbc_connection PUBLIC AUTO ALL) -target_link_libraries(itodbc_connection odfesqlodbc itodbc_helper ut_helper gtest_main) +target_link_libraries(itodbc_connection sqlodbc itodbc_helper ut_helper gtest_main) target_compile_definitions(itodbc_connection PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt index 95826369e82..d6bdf5da0b5 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt @@ -36,5 +36,5 @@ add_executable(itodbc_descriptors ${SOURCE_FILES}) # Library dependencies target_code_coverage(itodbc_descriptors PUBLIC AUTO ALL) -target_link_libraries(itodbc_descriptors odfesqlodbc itodbc_helper ut_helper gtest_main) +target_link_libraries(itodbc_descriptors sqlodbc itodbc_helper ut_helper gtest_main) target_compile_definitions(itodbc_descriptors PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt index 3b8825324fd..e93bf544f48 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt @@ -35,5 +35,5 @@ include_directories( ${UT_HELPER} add_executable(itodbc_execution ${SOURCE_FILES}) # Library dependencies -target_link_libraries(itodbc_execution odfesqlodbc itodbc_helper ut_helper gtest_main) +target_link_libraries(itodbc_execution sqlodbc itodbc_helper ut_helper gtest_main) target_compile_definitions(itodbc_execution PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt index c0cc86ef569..d3d17744671 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt @@ -37,5 +37,5 @@ include_directories( add_library(itodbc_helper SHARED ${SOURCE_FILES} ${HEADER_FILES}) # Library dependencies -target_link_libraries(itodbc_helper odfesqlodbc ut_helper gtest_main) +target_link_libraries(itodbc_helper sqlodbc ut_helper gtest_main) target_compile_definitions(itodbc_helper PUBLIC _UNICODE UNICODE) \ No newline at end of file diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt index fc9619a0f69..d4a850c81b8 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt @@ -36,5 +36,5 @@ add_executable(itodbc_info ${SOURCE_FILES}) # Library dependencies target_code_coverage(itodbc_info PUBLIC AUTO ALL) -target_link_libraries(itodbc_info odfesqlodbc itodbc_helper ut_helper gtest_main) +target_link_libraries(itodbc_info sqlodbc itodbc_helper ut_helper gtest_main) target_compile_definitions(itodbc_info PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt index 4f5acc616d9..d3c9f517be7 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt @@ -36,5 +36,5 @@ add_executable(itodbc_pagination ${SOURCE_FILES}) # Library dependencies target_code_coverage(itodbc_pagination PUBLIC AUTO ALL) -target_link_libraries(itodbc_pagination odfesqlodbc itodbc_helper ut_helper gtest_main) +target_link_libraries(itodbc_pagination sqlodbc itodbc_helper ut_helper gtest_main) target_compile_definitions(itodbc_pagination PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt index c30e195332b..ecfc0daed67 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt @@ -36,5 +36,5 @@ add_executable(itodbc_results ${SOURCE_FILES}) # Library dependencies target_code_coverage(itodbc_results PUBLIC AUTO ALL) -target_link_libraries(itodbc_results odfesqlodbc itodbc_helper ut_helper gtest_main) +target_link_libraries(itodbc_results sqlodbc itodbc_helper ut_helper gtest_main) target_compile_definitions(itodbc_results PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt index 9b1beff5b03..f0c70671c1a 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt @@ -36,5 +36,5 @@ add_executable(itodbc_tableau_queries ${SOURCE_FILES}) # Library dependencies target_code_coverage(itodbc_tableau_queries PUBLIC AUTO ALL) -target_link_libraries(itodbc_tableau_queries odfesqlodbc itodbc_helper ut_helper gtest_main) +target_link_libraries(itodbc_tableau_queries sqlodbc itodbc_helper ut_helper gtest_main) target_compile_definitions(itodbc_tableau_queries PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt index c8f48b9f387..1822dd87040 100644 --- a/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt +++ b/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt @@ -32,5 +32,5 @@ include_directories(${ODFEODBC_SRC}) add_executable(performance_execution ${SOURCE_FILES}) # Library dependencies -target_link_libraries(performance_execution odfesqlodbc) +target_link_libraries(performance_execution sqlodbc) target_compile_definitions(performance_execution PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt index c51eff6b613..6abb2c1084a 100644 --- a/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt +++ b/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt @@ -37,5 +37,5 @@ include_directories( ${UT_HELPER} add_executable(performance_info ${SOURCE_FILES}) # Library dependencies -target_link_libraries(performance_info odfesqlodbc itodbc_helper ut_helper gtest_main) +target_link_libraries(performance_info sqlodbc itodbc_helper ut_helper gtest_main) target_compile_definitions(performance_info PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt index 2149f8a792b..68776c9b209 100644 --- a/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt +++ b/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt @@ -35,5 +35,5 @@ include_directories( ${UT_HELPER} add_executable(performance_results ${SOURCE_FILES}) # Library dependencies -target_link_libraries(performance_results odfesqlodbc itodbc_helper ut_helper gtest_main) +target_link_libraries(performance_results sqlodbc itodbc_helper ut_helper gtest_main) target_compile_definitions(performance_results PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/PowerBIConnector/PBIDSExamples/odfesqlodbc_import.pbids b/sql-odbc/src/PowerBIConnector/PBIDSExamples/odfesqlodbc_import.pbids index f567a76409f..1b105876312 100644 --- a/sql-odbc/src/PowerBIConnector/PBIDSExamples/odfesqlodbc_import.pbids +++ b/sql-odbc/src/PowerBIConnector/PBIDSExamples/odfesqlodbc_import.pbids @@ -3,7 +3,7 @@ "connections": [ { "details": { - "protocol": "odfesqlodbc", + "protocol": "sqlodbc", "address": { "server": "localhost:9200" } diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.mproj b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj similarity index 100% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.mproj rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.pq b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq similarity index 99% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.pq rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq index f72ec09ee0e..8d2493f27f4 100644 --- a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.pq +++ b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq @@ -181,8 +181,8 @@ OdfeSqlOdbcPBIConnector = [ // PBIDS Handler DSRHandlers = [ - #"odfesqlodbc" = [ - GetDSR = (server, schema, object, optional options) => [ protocol = "odfesqlodbc", address = [ server = server ] ], + #"sqlodbc" = [ + GetDSR = (server, schema, object, optional options) => [ protocol = "sqlodbc", address = [ server = server ] ], GetFormula = (dsr, optional options) => () => let db = OdfeSqlOdbcPBIConnector.Contents(dsr[address][server]) diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.query.pq b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq similarity index 100% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.query.pq rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector16.png b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector16.png similarity index 100% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector16.png rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector16.png diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector20.png b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector20.png similarity index 100% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector20.png rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector20.png diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector24.png b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector24.png similarity index 100% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector24.png rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector24.png diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector32.png b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector32.png similarity index 100% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector32.png rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector32.png diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector40.png b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector40.png similarity index 100% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector40.png rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector40.png diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector48.png b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector48.png similarity index 100% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector48.png rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector48.png diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector64.png b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector64.png similarity index 100% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector64.png rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector64.png diff --git a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector80.png b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector80.png similarity index 100% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector80.png rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector80.png diff --git a/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt b/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt index 416853f8bad..6692ab5762c 100644 --- a/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt +++ b/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt @@ -37,5 +37,5 @@ include_directories( ${UT_HELPER} add_executable(ut_conn ${SOURCE_FILES}) # Library dependencies -target_link_libraries(ut_conn odfesqlodbc ut_helper gtest_main) +target_link_libraries(ut_conn sqlodbc ut_helper gtest_main) target_compile_definitions(ut_conn PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt b/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt index 52053f97668..503fa484117 100644 --- a/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt +++ b/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt @@ -36,5 +36,5 @@ include_directories( ${UT_HELPER} add_executable(ut_critical_section ${SOURCE_FILES}) # Library dependencies -target_link_libraries(ut_critical_section odfesqlodbc ut_helper gtest_main) +target_link_libraries(ut_critical_section sqlodbc ut_helper gtest_main) target_compile_definitions(ut_critical_section PUBLIC _UNICODE UNICODE) diff --git a/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt b/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt index ab8dc398ff7..fd9ffb6295a 100644 --- a/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt +++ b/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt @@ -47,5 +47,5 @@ target_link_libraries(ut_helper ${VLD}) endif() # Library dependencies -target_link_libraries(ut_helper odfesqlodbc gtest_main) +target_link_libraries(ut_helper sqlodbc gtest_main) target_compile_definitions(ut_helper PUBLIC _UNICODE UNICODE) \ No newline at end of file diff --git a/sql-odbc/src/installer/CMakeLists.txt b/sql-odbc/src/installer/CMakeLists.txt index e5d7bc74f85..a16049c96af 100644 --- a/sql-odbc/src/installer/CMakeLists.txt +++ b/sql-odbc/src/installer/CMakeLists.txt @@ -101,7 +101,7 @@ cpack_add_component(Resources ) # Install driver files -install(TARGETS odfesqlodbc DESTINATION bin COMPONENT "Driver") +install(TARGETS sqlodbc DESTINATION bin COMPONENT "Driver") # TODO: look into DSN Installer failure # if(APPLE) # install(FILES "${PROJECT_ROOT}/bin64/dsn_installer" DESTINATION bin COMPONENT "Driver") diff --git a/sql-odbc/src/odfesqlodbc/CMakeLists.txt b/sql-odbc/src/sqlodbc/CMakeLists.txt similarity index 81% rename from sql-odbc/src/odfesqlodbc/CMakeLists.txt rename to sql-odbc/src/sqlodbc/CMakeLists.txt index cc7802194a9..e6dae41bf43 100644 --- a/sql-odbc/src/odfesqlodbc/CMakeLists.txt +++ b/sql-odbc/src/sqlodbc/CMakeLists.txt @@ -22,9 +22,9 @@ # permissions and limitations under the License. # -project(odfesqlodbc) +project(sqlodbc) -# Source files for odfesqlodbc +# Source files for sqlodbc set( SOURCE_FILES bind.c columninfo.c connection.c convert.c descriptor.c dlg_specific.c drvconn.c options.c @@ -56,9 +56,9 @@ set( HEADER_FILES # Generate dll (SHARED) if(WIN32) set(RESOURCE_FILES opensearch_odbc.rc) -add_library(odfesqlodbc SHARED ${SOURCE_FILES} ${HEADER_FILES} ${RESOURCE_FILES} ${AWSSDK_LIB_DIR}) +add_library(sqlodbc SHARED ${SOURCE_FILES} ${HEADER_FILES} ${RESOURCE_FILES} ${AWSSDK_LIB_DIR}) else() -add_library(odfesqlodbc SHARED ${SOURCE_FILES} ${HEADER_FILES}) +add_library(sqlodbc SHARED ${SOURCE_FILES} ${HEADER_FILES}) endif() include_directories( @@ -73,14 +73,14 @@ include_directories( # Platform specific library dependencies if(WIN32) # Windows specifiec - target_link_libraries(odfesqlodbc wsock32 ws2_32 winmm user32 gdi32 legacy_stdio_definitions aws-cpp-sdk-core kernel32 advapi32 secur32 XOleHlp Wldap32 crypt32 Normaliz odbccp32 odbc32) - target_link_libraries(odfesqlodbc debug msvcrtd) - target_link_libraries(odfesqlodbc optimized msvcrt) + target_link_libraries(sqlodbc wsock32 ws2_32 winmm user32 gdi32 legacy_stdio_definitions aws-cpp-sdk-core kernel32 advapi32 secur32 XOleHlp Wldap32 crypt32 Normaliz odbccp32 odbc32) + target_link_libraries(sqlodbc debug msvcrtd) + target_link_libraries(sqlodbc optimized msvcrt) elseif(APPLE) # Apple specific - target_link_libraries(odfesqlodbc iodbc iodbcinst aws-cpp-sdk-core) + target_link_libraries(sqlodbc iodbc iodbcinst aws-cpp-sdk-core) elseif(UNIX) # Unix specific include_directories(/usr/src/linux-headers-5.0.0-27/include) - target_link_libraries(odfesqlodbc aws-cpp-sdk-core odbc odbcinst) + target_link_libraries(sqlodbc aws-cpp-sdk-core odbc odbcinst) endif() diff --git a/sql-odbc/src/odfesqlodbc/bind.c b/sql-odbc/src/sqlodbc/bind.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/bind.c rename to sql-odbc/src/sqlodbc/bind.c diff --git a/sql-odbc/src/odfesqlodbc/bind.h b/sql-odbc/src/sqlodbc/bind.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/bind.h rename to sql-odbc/src/sqlodbc/bind.h diff --git a/sql-odbc/src/odfesqlodbc/catfunc.h b/sql-odbc/src/sqlodbc/catfunc.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/catfunc.h rename to sql-odbc/src/sqlodbc/catfunc.h diff --git a/sql-odbc/src/odfesqlodbc/columninfo.c b/sql-odbc/src/sqlodbc/columninfo.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/columninfo.c rename to sql-odbc/src/sqlodbc/columninfo.c diff --git a/sql-odbc/src/odfesqlodbc/columninfo.h b/sql-odbc/src/sqlodbc/columninfo.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/columninfo.h rename to sql-odbc/src/sqlodbc/columninfo.h diff --git a/sql-odbc/src/odfesqlodbc/connection.c b/sql-odbc/src/sqlodbc/connection.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/connection.c rename to sql-odbc/src/sqlodbc/connection.c diff --git a/sql-odbc/src/odfesqlodbc/convert.c b/sql-odbc/src/sqlodbc/convert.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/convert.c rename to sql-odbc/src/sqlodbc/convert.c diff --git a/sql-odbc/src/odfesqlodbc/convert.h b/sql-odbc/src/sqlodbc/convert.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/convert.h rename to sql-odbc/src/sqlodbc/convert.h diff --git a/sql-odbc/src/odfesqlodbc/descriptor.c b/sql-odbc/src/sqlodbc/descriptor.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/descriptor.c rename to sql-odbc/src/sqlodbc/descriptor.c diff --git a/sql-odbc/src/odfesqlodbc/descriptor.h b/sql-odbc/src/sqlodbc/descriptor.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/descriptor.h rename to sql-odbc/src/sqlodbc/descriptor.h diff --git a/sql-odbc/src/odfesqlodbc/dlg_specific.c b/sql-odbc/src/sqlodbc/dlg_specific.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/dlg_specific.c rename to sql-odbc/src/sqlodbc/dlg_specific.c diff --git a/sql-odbc/src/odfesqlodbc/dlg_specific.h b/sql-odbc/src/sqlodbc/dlg_specific.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/dlg_specific.h rename to sql-odbc/src/sqlodbc/dlg_specific.h diff --git a/sql-odbc/src/odfesqlodbc/dlg_wingui.c b/sql-odbc/src/sqlodbc/dlg_wingui.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/dlg_wingui.c rename to sql-odbc/src/sqlodbc/dlg_wingui.c diff --git a/sql-odbc/src/odfesqlodbc/drvconn.c b/sql-odbc/src/sqlodbc/drvconn.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/drvconn.c rename to sql-odbc/src/sqlodbc/drvconn.c diff --git a/sql-odbc/src/odfesqlodbc/drvconn.h b/sql-odbc/src/sqlodbc/drvconn.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/drvconn.h rename to sql-odbc/src/sqlodbc/drvconn.h diff --git a/sql-odbc/src/odfesqlodbc/environ.c b/sql-odbc/src/sqlodbc/environ.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/environ.c rename to sql-odbc/src/sqlodbc/environ.c diff --git a/sql-odbc/src/odfesqlodbc/environ.h b/sql-odbc/src/sqlodbc/environ.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/environ.h rename to sql-odbc/src/sqlodbc/environ.h diff --git a/sql-odbc/src/odfesqlodbc/execute.c b/sql-odbc/src/sqlodbc/execute.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/execute.c rename to sql-odbc/src/sqlodbc/execute.c diff --git a/sql-odbc/src/odfesqlodbc/info.c b/sql-odbc/src/sqlodbc/info.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/info.c rename to sql-odbc/src/sqlodbc/info.c diff --git a/sql-odbc/src/odfesqlodbc/loadlib.c b/sql-odbc/src/sqlodbc/loadlib.c similarity index 98% rename from sql-odbc/src/odfesqlodbc/loadlib.c rename to sql-odbc/src/sqlodbc/loadlib.c index b0f54109acf..3b388e320c2 100644 --- a/sql-odbc/src/odfesqlodbc/loadlib.c +++ b/sql-odbc/src/sqlodbc/loadlib.c @@ -63,13 +63,13 @@ #ifdef UNICODE_SUPPORT CSTR opensearch_enlist = "opensearch_enlist"; CSTR opensearch_enlistdll = "opensearch_enlist.dll"; -CSTR elasticodbc = "odfesqlodbc35w"; -CSTR elasticodbcdll = "odfesqlodbc35w.dll"; +CSTR elasticodbc = "sqlodbc35w"; +CSTR elasticodbcdll = "sqlodbc35w.dll"; #else CSTR opensearch_enlist = "opensearch_enlista"; CSTR opensearch_enlistdll = "opensearch_enlista.dll"; -CSTR elasticodbc = "odfesqlodbc30a"; -CSTR elasticodbcdll = "odfesqlodbc30a.dll"; +CSTR elasticodbc = "sqlodbc30a"; +CSTR elasticodbcdll = "sqlodbc30a.dll"; #endif /* UNICODE_SUPPORT */ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #define _MSC_DELAY_LOAD_IMPORT diff --git a/sql-odbc/src/odfesqlodbc/loadlib.h b/sql-odbc/src/sqlodbc/loadlib.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/loadlib.h rename to sql-odbc/src/sqlodbc/loadlib.h diff --git a/sql-odbc/src/odfesqlodbc/misc.c b/sql-odbc/src/sqlodbc/misc.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/misc.c rename to sql-odbc/src/sqlodbc/misc.c diff --git a/sql-odbc/src/odfesqlodbc/misc.h b/sql-odbc/src/sqlodbc/misc.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/misc.h rename to sql-odbc/src/sqlodbc/misc.h diff --git a/sql-odbc/src/odfesqlodbc/multibyte.c b/sql-odbc/src/sqlodbc/multibyte.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/multibyte.c rename to sql-odbc/src/sqlodbc/multibyte.c diff --git a/sql-odbc/src/odfesqlodbc/multibyte.h b/sql-odbc/src/sqlodbc/multibyte.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/multibyte.h rename to sql-odbc/src/sqlodbc/multibyte.h diff --git a/sql-odbc/src/odfesqlodbc/mylog.c b/sql-odbc/src/sqlodbc/mylog.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/mylog.c rename to sql-odbc/src/sqlodbc/mylog.c diff --git a/sql-odbc/src/odfesqlodbc/mylog.h b/sql-odbc/src/sqlodbc/mylog.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/mylog.h rename to sql-odbc/src/sqlodbc/mylog.h diff --git a/sql-odbc/src/odfesqlodbc/odbcapi.c b/sql-odbc/src/sqlodbc/odbcapi.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/odbcapi.c rename to sql-odbc/src/sqlodbc/odbcapi.c diff --git a/sql-odbc/src/odfesqlodbc/odbcapi30.c b/sql-odbc/src/sqlodbc/odbcapi30.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/odbcapi30.c rename to sql-odbc/src/sqlodbc/odbcapi30.c diff --git a/sql-odbc/src/odfesqlodbc/odbcapi30w.c b/sql-odbc/src/sqlodbc/odbcapi30w.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/odbcapi30w.c rename to sql-odbc/src/sqlodbc/odbcapi30w.c diff --git a/sql-odbc/src/odfesqlodbc/odbcapiw.c b/sql-odbc/src/sqlodbc/odbcapiw.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/odbcapiw.c rename to sql-odbc/src/sqlodbc/odbcapiw.c diff --git a/sql-odbc/src/odfesqlodbc/opensearch_api30.c b/sql-odbc/src/sqlodbc/opensearch_api30.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_api30.c rename to sql-odbc/src/sqlodbc/opensearch_api30.c diff --git a/sql-odbc/src/odfesqlodbc/opensearch_apifunc.h b/sql-odbc/src/sqlodbc/opensearch_apifunc.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_apifunc.h rename to sql-odbc/src/sqlodbc/opensearch_apifunc.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_communication.cpp b/sql-odbc/src/sqlodbc/opensearch_communication.cpp similarity index 99% rename from sql-odbc/src/odfesqlodbc/opensearch_communication.cpp rename to sql-odbc/src/sqlodbc/opensearch_communication.cpp index a481fb3cc1f..8529a922451 100644 --- a/sql-odbc/src/odfesqlodbc/opensearch_communication.cpp +++ b/sql-odbc/src/sqlodbc/opensearch_communication.cpp @@ -27,7 +27,7 @@ #include "opensearch_communication.h" -// odfesqlodbc needs to be included before mylog, otherwise mylog will generate +// sqlodbc needs to be included before mylog, otherwise mylog will generate // compiler warnings // clang-format off #include "opensearch_odbc.h" diff --git a/sql-odbc/src/odfesqlodbc/opensearch_communication.h b/sql-odbc/src/sqlodbc/opensearch_communication.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_communication.h rename to sql-odbc/src/sqlodbc/opensearch_communication.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_connection.cpp b/sql-odbc/src/sqlodbc/opensearch_connection.cpp similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_connection.cpp rename to sql-odbc/src/sqlodbc/opensearch_connection.cpp diff --git a/sql-odbc/src/odfesqlodbc/opensearch_connection.h b/sql-odbc/src/sqlodbc/opensearch_connection.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_connection.h rename to sql-odbc/src/sqlodbc/opensearch_connection.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_driver_connect.cpp b/sql-odbc/src/sqlodbc/opensearch_driver_connect.cpp similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_driver_connect.cpp rename to sql-odbc/src/sqlodbc/opensearch_driver_connect.cpp diff --git a/sql-odbc/src/odfesqlodbc/opensearch_driver_connect.h b/sql-odbc/src/sqlodbc/opensearch_driver_connect.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_driver_connect.h rename to sql-odbc/src/sqlodbc/opensearch_driver_connect.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_helper.cpp b/sql-odbc/src/sqlodbc/opensearch_helper.cpp similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_helper.cpp rename to sql-odbc/src/sqlodbc/opensearch_helper.cpp diff --git a/sql-odbc/src/odfesqlodbc/opensearch_helper.h b/sql-odbc/src/sqlodbc/opensearch_helper.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_helper.h rename to sql-odbc/src/sqlodbc/opensearch_helper.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_info.cpp b/sql-odbc/src/sqlodbc/opensearch_info.cpp similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_info.cpp rename to sql-odbc/src/sqlodbc/opensearch_info.cpp diff --git a/sql-odbc/src/odfesqlodbc/opensearch_info.h b/sql-odbc/src/sqlodbc/opensearch_info.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_info.h rename to sql-odbc/src/sqlodbc/opensearch_info.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_odbc.c b/sql-odbc/src/sqlodbc/opensearch_odbc.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_odbc.c rename to sql-odbc/src/sqlodbc/opensearch_odbc.c diff --git a/sql-odbc/src/odfesqlodbc/opensearch_odbc.h b/sql-odbc/src/sqlodbc/opensearch_odbc.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_odbc.h rename to sql-odbc/src/sqlodbc/opensearch_odbc.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_odbc.rc b/sql-odbc/src/sqlodbc/opensearch_odbc.rc similarity index 99% rename from sql-odbc/src/odfesqlodbc/opensearch_odbc.rc rename to sql-odbc/src/sqlodbc/opensearch_odbc.rc index e303b0764b7..30cf00e8493 100644 --- a/sql-odbc/src/odfesqlodbc/opensearch_odbc.rc +++ b/sql-odbc/src/sqlodbc/opensearch_odbc.rc @@ -184,7 +184,7 @@ BEGIN VALUE "CompanyName", "Amazon" VALUE "FileDescription", "OpenSearch ODBC Driver (English)" VALUE "FileVersion", OPENSEARCH_ODBC_VERSION - VALUE "InternalName", "odfesqlodbc" + VALUE "InternalName", "sqlodbc" VALUE "LegalCopyright", "Copyright" VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoft? is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation." VALUE "OriginalFilename", "sqlodbc.dll" diff --git a/sql-odbc/src/odfesqlodbc/opensearch_parse_result.cpp b/sql-odbc/src/sqlodbc/opensearch_parse_result.cpp similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_parse_result.cpp rename to sql-odbc/src/sqlodbc/opensearch_parse_result.cpp diff --git a/sql-odbc/src/odfesqlodbc/opensearch_parse_result.h b/sql-odbc/src/sqlodbc/opensearch_parse_result.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_parse_result.h rename to sql-odbc/src/sqlodbc/opensearch_parse_result.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_result_queue.cpp b/sql-odbc/src/sqlodbc/opensearch_result_queue.cpp similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_result_queue.cpp rename to sql-odbc/src/sqlodbc/opensearch_result_queue.cpp diff --git a/sql-odbc/src/odfesqlodbc/opensearch_result_queue.h b/sql-odbc/src/sqlodbc/opensearch_result_queue.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_result_queue.h rename to sql-odbc/src/sqlodbc/opensearch_result_queue.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_semaphore.cpp b/sql-odbc/src/sqlodbc/opensearch_semaphore.cpp similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_semaphore.cpp rename to sql-odbc/src/sqlodbc/opensearch_semaphore.cpp diff --git a/sql-odbc/src/odfesqlodbc/opensearch_semaphore.h b/sql-odbc/src/sqlodbc/opensearch_semaphore.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_semaphore.h rename to sql-odbc/src/sqlodbc/opensearch_semaphore.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_statement.cpp b/sql-odbc/src/sqlodbc/opensearch_statement.cpp similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_statement.cpp rename to sql-odbc/src/sqlodbc/opensearch_statement.cpp diff --git a/sql-odbc/src/odfesqlodbc/opensearch_statement.h b/sql-odbc/src/sqlodbc/opensearch_statement.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_statement.h rename to sql-odbc/src/sqlodbc/opensearch_statement.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_types.c b/sql-odbc/src/sqlodbc/opensearch_types.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_types.c rename to sql-odbc/src/sqlodbc/opensearch_types.c diff --git a/sql-odbc/src/odfesqlodbc/opensearch_types.h b/sql-odbc/src/sqlodbc/opensearch_types.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_types.h rename to sql-odbc/src/sqlodbc/opensearch_types.h diff --git a/sql-odbc/src/odfesqlodbc/opensearch_utility.cpp b/sql-odbc/src/sqlodbc/opensearch_utility.cpp similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_utility.cpp rename to sql-odbc/src/sqlodbc/opensearch_utility.cpp diff --git a/sql-odbc/src/odfesqlodbc/opensearch_utility.h b/sql-odbc/src/sqlodbc/opensearch_utility.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/opensearch_utility.h rename to sql-odbc/src/sqlodbc/opensearch_utility.h diff --git a/sql-odbc/src/odfesqlodbc/options.c b/sql-odbc/src/sqlodbc/options.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/options.c rename to sql-odbc/src/sqlodbc/options.c diff --git a/sql-odbc/src/odfesqlodbc/parse.c b/sql-odbc/src/sqlodbc/parse.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/parse.c rename to sql-odbc/src/sqlodbc/parse.c diff --git a/sql-odbc/src/odfesqlodbc/qresult.c b/sql-odbc/src/sqlodbc/qresult.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/qresult.c rename to sql-odbc/src/sqlodbc/qresult.c diff --git a/sql-odbc/src/odfesqlodbc/qresult.h b/sql-odbc/src/sqlodbc/qresult.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/qresult.h rename to sql-odbc/src/sqlodbc/qresult.h diff --git a/sql-odbc/src/odfesqlodbc/resource.h b/sql-odbc/src/sqlodbc/resource.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/resource.h rename to sql-odbc/src/sqlodbc/resource.h diff --git a/sql-odbc/src/odfesqlodbc/results.c b/sql-odbc/src/sqlodbc/results.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/results.c rename to sql-odbc/src/sqlodbc/results.c diff --git a/sql-odbc/src/odfesqlodbc/setup.c b/sql-odbc/src/sqlodbc/setup.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/setup.c rename to sql-odbc/src/sqlodbc/setup.c diff --git a/sql-odbc/src/odfesqlodbc/statement.c b/sql-odbc/src/sqlodbc/statement.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/statement.c rename to sql-odbc/src/sqlodbc/statement.c diff --git a/sql-odbc/src/odfesqlodbc/statement.h b/sql-odbc/src/sqlodbc/statement.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/statement.h rename to sql-odbc/src/sqlodbc/statement.h diff --git a/sql-odbc/src/odfesqlodbc/tuple.c b/sql-odbc/src/sqlodbc/tuple.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/tuple.c rename to sql-odbc/src/sqlodbc/tuple.c diff --git a/sql-odbc/src/odfesqlodbc/tuple.h b/sql-odbc/src/sqlodbc/tuple.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/tuple.h rename to sql-odbc/src/sqlodbc/tuple.h diff --git a/sql-odbc/src/odfesqlodbc/unicode_support.h b/sql-odbc/src/sqlodbc/unicode_support.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/unicode_support.h rename to sql-odbc/src/sqlodbc/unicode_support.h diff --git a/sql-odbc/src/odfesqlodbc/version.h b/sql-odbc/src/sqlodbc/version.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/version.h rename to sql-odbc/src/sqlodbc/version.h diff --git a/sql-odbc/src/odfesqlodbc/win_setup.h b/sql-odbc/src/sqlodbc/win_setup.h similarity index 100% rename from sql-odbc/src/odfesqlodbc/win_setup.h rename to sql-odbc/src/sqlodbc/win_setup.h diff --git a/sql-odbc/src/odfesqlodbc/win_unicode.c b/sql-odbc/src/sqlodbc/win_unicode.c similarity index 100% rename from sql-odbc/src/odfesqlodbc/win_unicode.c rename to sql-odbc/src/sqlodbc/win_unicode.c From 1aa2755bb78ffd2d9f6fc7d4c9441df820c8f93d Mon Sep 17 00:00:00 2001 From: Chen Dai Date: Tue, 18 May 2021 10:07:43 -0700 Subject: [PATCH 5/6] Replace all odfe Signed-off-by: Chen Dai --- sql-odbc/.gitignore | 2 +- sql-odbc/README.md | 4 +-- sql-odbc/docs/dev/run_tests.md | 2 +- .../docs/user/microsoft_excel_support_mac.md | 2 +- sql-odbc/docs/user/power_bi_support.md | 10 +++---- sql-odbc/docs/user/tableau_support.md | 6 ++-- sql-odbc/src/CMakeLists.txt | 8 ++--- .../ITODBCAwsAuth/CMakeLists.txt | 2 +- .../ITODBCCatalog/CMakeLists.txt | 2 +- .../ITODBCCatalog/test_odbc_catalog.cpp | 10 +++---- .../ITODBCConnection/CMakeLists.txt | 2 +- .../ITODBCDescriptors/CMakeLists.txt | 2 +- .../ITODBCExecution/CMakeLists.txt | 2 +- .../ITODBCHelper/CMakeLists.txt | 2 +- .../ITODBCInfo/CMakeLists.txt | 2 +- .../ITODBCPagination/CMakeLists.txt | 2 +- .../ITODBCResults/CMakeLists.txt | 2 +- .../ITODBCTableauQueries/CMakeLists.txt | 2 +- .../PTODBCExecution/CMakeLists.txt | 2 +- .../PTODBCInfo/CMakeLists.txt | 2 +- .../PTODBCResults/CMakeLists.txt | 2 +- ...odbc_import.pbids => sqlodbc_import.pbids} | 0 .../SqlOdbcPBIConnector.mproj | 22 +++++++------- .../PowerBIConnector/SqlOdbcPBIConnector.pq | 28 +++++++++--------- .../SqlOdbcPBIConnector.query.pq | 4 +-- ...IConnector.mez => SqlOdbcPBIConnector.mez} | Bin .../README.md | 4 +-- .../connection-dialog.tcd | 2 +- .../connectionBuilder.js | 0 .../connectionResolver.tdr | 2 +- .../dialect.tdd | 4 +-- .../manifest.xml | 4 +-- .../opensearch_sql_odbc.taco} | Bin .../README.md | 4 +-- .../connection-dialog.tcd | 2 +- .../connectionBuilder.js | 0 .../connectionResolver.tdr | 2 +- .../dialect.tdd | 4 +-- .../manifest.xml | 4 +-- .../opensearch_sql_odbc_dev.taco} | Bin sql-odbc/src/UnitTests/UTConn/CMakeLists.txt | 2 +- .../UTCriticalSection/CMakeLists.txt | 2 +- .../src/UnitTests/UTHelper/CMakeLists.txt | 2 +- sql-odbc/src/installer/CMakeLists.txt | 4 +-- ...e_sql_odbc.tdc => opensearch_sql_odbc.tdc} | 0 ...e-odfe-dsn.sh => remove-opensearch-dsn.sh} | 0 sql-odbc/src/odfeenlist/CMakeLists.txt | 10 +++---- sql-odbc/src/sqlodbc/CMakeLists.txt | 2 +- 48 files changed, 89 insertions(+), 89 deletions(-) rename sql-odbc/src/PowerBIConnector/PBIDSExamples/{odfesqlodbc_import.pbids => sqlodbc_import.pbids} (100%) rename sql-odbc/src/PowerBIConnector/bin/Release/{OdfeSqlOdbcPBIConnector.mez => SqlOdbcPBIConnector.mez} (100%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc => opensearch_sql_odbc}/README.md (76%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc_dev => opensearch_sql_odbc}/connection-dialog.tcd (92%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc => opensearch_sql_odbc}/connectionBuilder.js (100%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc_dev => opensearch_sql_odbc}/connectionResolver.tdr (95%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc => opensearch_sql_odbc}/dialect.tdd (99%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc => opensearch_sql_odbc}/manifest.xml (92%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc/odfe_sql_odbc.taco => opensearch_sql_odbc/opensearch_sql_odbc.taco} (100%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc_dev => opensearch_sql_odbc_dev}/README.md (82%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc => opensearch_sql_odbc_dev}/connection-dialog.tcd (92%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc_dev => opensearch_sql_odbc_dev}/connectionBuilder.js (100%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc => opensearch_sql_odbc_dev}/connectionResolver.tdr (95%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc_dev => opensearch_sql_odbc_dev}/dialect.tdd (60%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc_dev => opensearch_sql_odbc_dev}/manifest.xml (74%) rename sql-odbc/src/TableauConnector/{odfe_sql_odbc_dev/odfe_sql_odbc_dev.taco => opensearch_sql_odbc_dev/opensearch_sql_odbc_dev.taco} (100%) rename sql-odbc/src/installer/Resources/{odfe_sql_odbc.tdc => opensearch_sql_odbc.tdc} (100%) rename sql-odbc/src/installer/{remove-odfe-dsn.sh => remove-opensearch-dsn.sh} (100%) diff --git a/sql-odbc/.gitignore b/sql-odbc/.gitignore index 0ca253ba17d..4202615e96c 100644 --- a/sql-odbc/.gitignore +++ b/sql-odbc/.gitignore @@ -42,7 +42,7 @@ LICENSE.txt /googletest/ /installer/ /IntegrationTests/ -/odfeenlist/ +/opensearchenlist/ /sqlodbc/ /PerformanceTests/ /UnitTests/ diff --git a/sql-odbc/README.md b/sql-odbc/README.md index c281f5eaa01..0610caf305a 100644 --- a/sql-odbc/README.md +++ b/sql-odbc/README.md @@ -16,8 +16,8 @@ The driver is compatible with ODBC 3.51. ## Connectors -* **Power BI Desktop**: [`OdfeSqlOdbcPBIConnector.mez`](./src/PowerBIConnector/bin/Release/OdfeSqlOdbcPBIConnector.mez) -* **Tableau**: [`odfe_sql_odbc.taco`](./src/TableauConnector/odfe_sql_odbc/odfe_sql_odbc.taco) +* **Power BI Desktop**: [`SqlOdbcPBIConnector.mez`](./src/PowerBIConnector/bin/Release/SqlOdbcPBIConnector.mez) +* **Tableau**: [`opensearch_sql_odbc.taco`](./src/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco) ## Installing the Driver diff --git a/sql-odbc/docs/dev/run_tests.md b/sql-odbc/docs/dev/run_tests.md index 3072e6551b8..95e166e30f5 100644 --- a/sql-odbc/docs/dev/run_tests.md +++ b/sql-odbc/docs/dev/run_tests.md @@ -10,7 +10,7 @@ Loading a dataset requires an [OpenSearch](https://opendistro.github.io/for-elasticsearch-docs/docs/install/) service running with [OpenSearch Dashboards](https://opendistro.github.io/for-elasticsearch-docs/docs/kibana/). If either of these are missing, please refer to the documentation on how to set them up. -Note, if you wish to work with SSL/TLS, you need to configure ODFE and OpenSearch Dashboards to support it. See the [build instructions](./BUILD_INSTRUCTIONS.md) for more info. +Note, if you wish to work with SSL/TLS, you need to configure OpenSearch and OpenSearch Dashboards to support it. See the [build instructions](./BUILD_INSTRUCTIONS.md) for more info. First load the sample datasets provided by OpenSearch Dashboards. diff --git a/sql-odbc/docs/user/microsoft_excel_support_mac.md b/sql-odbc/docs/user/microsoft_excel_support_mac.md index 11d3d7ede4c..7b7f829f2ef 100644 --- a/sql-odbc/docs/user/microsoft_excel_support_mac.md +++ b/sql-odbc/docs/user/microsoft_excel_support_mac.md @@ -50,7 +50,7 @@ * 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. +> **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 OpenSearch server logs to see if the query failed. diff --git a/sql-odbc/docs/user/power_bi_support.md b/sql-odbc/docs/user/power_bi_support.md index 77709691de9..eba07e0b53e 100644 --- a/sql-odbc/docs/user/power_bi_support.md +++ b/sql-odbc/docs/user/power_bi_support.md @@ -4,11 +4,11 @@ * Microsoft Power BI Desktop * [OpenSearch](https://opendistro.github.io/for-elasticsearch-docs/docs/install/) * [OpenSearch SQL ODBC driver](https://opendistro.github.io/for-elasticsearch-docs/docs/sql/odbc/) -* [OdfeSqlOdbcPBIConnector.mez](../../src/PowerBIConnector/bin/Release/) +* [SqlOdbcPBIConnector.mez](../../src/PowerBIConnector/bin/Release/) * Optional: [sqlodbc_import.pbids](../../src/PowerBIConnector/PBIDSExamples) to help with repeated connections to the same server ## Setup -* Copy `OdfeSqlOdbcPBIConnector.mez` file in the `\Documents\Power BI Desktop\Custom Connectors\` folder. This will let Power BI access custom connector. +* Copy `SqlOdbcPBIConnector.mez` file in the `\Documents\Power BI Desktop\Custom Connectors\` folder. This will let Power BI access custom connector. * Open Power BI Desktop. * Change the security settings. Click on **Files** > **Options and settings** > **Options** > **Security** > Select **Allow any extension to load without validation or warning** for Data Extensions. This will allow the custom connector to load data into Power BI. @@ -74,12 +74,12 @@ Example PBIDS file for OpenSearch: (available here: [sqlodbc_import.pbids](../.. } ``` -The only part you should change is the `server` attribute, to point to the location of your ODFE server. -* For AWS connections, this will be the full path of your ODFE instance (ex: `https://aws-odfe-instance.us-west-1.com`). +The only part you should change is the `server` attribute, to point to the location of your OpenSearch server. +* For AWS connections, this will be the full path of your OpenSearch instance (ex: `https://aws-opensearch-instance.us-west-1.com`). * Otherwise, this will be the `host:port` combination for your instance (ex: `localhost:9200`). Save this as a `.pbids` file. Double-click on it to open up your connection in Power BI Desktop. -It will take you straight to the **Navigator** window for selecting the tables from the ODFE server. +It will take you straight to the **Navigator** window for selecting the tables from the OpenSearch server. * If this is the first time you are connecting to this instance, you will be prompted for your credentials. diff --git a/sql-odbc/docs/user/tableau_support.md b/sql-odbc/docs/user/tableau_support.md index 1c0cea4a650..f96c0612d0d 100644 --- a/sql-odbc/docs/user/tableau_support.md +++ b/sql-odbc/docs/user/tableau_support.md @@ -9,13 +9,13 @@ Connect an OpenSearch data source to Tableau Desktop via the Tableau Connector t * Download and Install [Tableau Desktop](https://www.tableau.com/products/desktop/download) 2020 and higher * Install and Configure [OpenSearch](https://opendistro.github.io/for-elasticsearch-docs/docs/install/) * Download and Install [OpenSearch SQL ODBC driver](../../README.md) -* Download Tableau Connector for `SQL by Open Distro for ES` ([odfe_sql_odbc.taco](../../src/TableauConnector/odfe_sql_odbc/odfe_sql_odbc.taco)). -Click on **Download** option for downloading `odfe_sql_odbc.taco` file. +* Download Tableau Connector for `SQL by Open Distro for ES` ([opensearch_sql_odbc.taco](../../src/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco)). +Click on **Download** option for downloading `opensearch_sql_odbc.taco` file. ## Prepare data -* Copy `odfe_sql_odbc.taco` file to My Tableau Repository. +* Copy `opensearch_sql_odbc.taco` file to My Tableau Repository. * On windows: **%User%/Documents/My Tableau Repository/Connectors/**. * On Mac: **~/Documents/My Tableau Repository/Connectors/**. diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt index 46712566a1c..fd24ea9e8f2 100644 --- a/sql-odbc/src/CMakeLists.txt +++ b/sql-odbc/src/CMakeLists.txt @@ -78,8 +78,8 @@ endif() # Base directories set(PROJECT_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/..") -set(ODFEODBC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/sqlodbc") -set(ODFEENLIST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/odfeenlist") +set(OPENSEARCHODBC_SRC "${CMAKE_CURRENT_SOURCE_DIR}/sqlodbc") +set(OPENSEARCHENLIST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/opensearchenlist") set(INTEGRATION_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/IntegrationTests") set(UNIT_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/UnitTests") set(LIBRARY_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../libraries) @@ -170,8 +170,8 @@ endif() if (APPLE) add_subdirectory(${aws-cpp-sdk-base}) endif() -add_subdirectory(${ODFEODBC_SRC}) -add_subdirectory(${ODFEENLIST_SRC}) +add_subdirectory(${OPENSEARCHODBC_SRC}) +add_subdirectory(${OPENSEARCHENLIST_SRC}) add_subdirectory(${INSTALL_SRC}) # Only build & package DSN installer for Mac platforms diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt index 56c66c96b19..30def0b0345 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt @@ -28,7 +28,7 @@ project(itodbc_aws_auth) set(SOURCE_FILES test_odbc_aws_auth.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ${AWSSDK_INCLUDE_DIR} ) diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt index f5f1039f570..ff4f78f0222 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt @@ -28,7 +28,7 @@ project(itodbc_catalog) set(SOURCE_FILES test_odbc_catalog.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp b/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp index 4c825fdf126..f53f7b90d6d 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp +++ b/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp @@ -102,7 +102,7 @@ const std::vector< short > flights_sql_data_type = { SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_TYPE_TIMESTAMP, SQL_WVARCHAR, SQL_WVARCHAR, SQL_BIT, SQL_REAL, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR}; -const std::string flights_catalog_odfe = "odfe-cluster"; +const std::string flights_catalog_opensearch = "opensearch-cluster"; const std::string flights_catalog_elas = "opensearch"; const std::string flights_table_name = "opensearch_dashboards_sample_data_flights"; const std::string flights_decimal_digits = "10"; @@ -451,9 +451,9 @@ TEST_SQL_KEYS(ForeignKeys_NULL, SQLForeignKeys, NULL, SQL_NTS, NULL, SQL_NTS, // Catalog specified TEST_SQL_KEYS(PrimaryKeys_Catalog, SQLPrimaryKeys, NULL, SQL_NTS, - (SQLTCHAR*)L"odfe-cluster", SQL_NTS, NULL, SQL_NTS) + (SQLTCHAR*)L"opensearch-cluster", SQL_NTS, NULL, SQL_NTS) TEST_SQL_KEYS(ForeignKeys_Catalog, SQLForeignKeys, NULL, SQL_NTS, NULL, SQL_NTS, - NULL, SQL_NTS, NULL, SQL_NTS, (SQLTCHAR*)L"odfe-cluster", SQL_NTS, + NULL, SQL_NTS, NULL, SQL_NTS, (SQLTCHAR*)L"opensearch-cluster", SQL_NTS, NULL, SQL_NTS) // Table specified @@ -465,10 +465,10 @@ TEST_SQL_KEYS(ForeignKeys_Table, SQLForeignKeys, NULL, SQL_NTS, NULL, SQL_NTS, // Catalog and table specified TEST_SQL_KEYS(PrimaryKeys_CatalogTable, SQLPrimaryKeys, NULL, SQL_NTS, - (SQLTCHAR*)L"odfe-cluster", SQL_NTS, + (SQLTCHAR*)L"opensearch-cluster", SQL_NTS, (SQLTCHAR*)L"opensearch_dashboards_sample_data_flights", SQL_NTS) TEST_SQL_KEYS(ForeignKeys_CatalogTable, SQLForeignKeys, NULL, SQL_NTS, NULL, - SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS, (SQLTCHAR*)L"odfe-cluster", + SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS, (SQLTCHAR*)L"opensearch-cluster", SQL_NTS, (SQLTCHAR*)L"opensearch_dashboards_sample_data_flights", SQL_NTS) // GetTypeInfo expected output struct diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt index 3d0ef5086dd..3f412af6701 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt @@ -28,7 +28,7 @@ project(itodbc_connection) set(SOURCE_FILES test_odbc_connection.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt index d6bdf5da0b5..868e653654b 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt @@ -28,7 +28,7 @@ project(itodbc_descriptors) set(SOURCE_FILES test_odbc_descriptors.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt index e93bf544f48..64709db0872 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt @@ -28,7 +28,7 @@ project(itodbc_execution) set(SOURCE_FILES test_odbc_execution.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable diff --git a/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt index d3d17744671..d61ac37f22e 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt @@ -29,7 +29,7 @@ set(SOURCE_FILES it_odbc_helper.cpp) set(HEADER_FILES it_odbc_helper.h) include_directories( ${UT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt index d4a850c81b8..6db8cac1001 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt @@ -28,7 +28,7 @@ project(itodbc_info) set(SOURCE_FILES test_odbc_info.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt index d3c9f517be7..c1f93d5117d 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt @@ -28,7 +28,7 @@ project(itodbc_pagination) set(SOURCE_FILES test_odbc_pagination.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt index ecfc0daed67..360d6c9906f 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt @@ -28,7 +28,7 @@ project(itodbc_results) set(SOURCE_FILES test_odbc_results.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt index f0c70671c1a..88fff768d9e 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt @@ -28,7 +28,7 @@ project(itodbc_tableau_queries) set(SOURCE_FILES test_odbc_tableau_queries.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable diff --git a/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt index 1822dd87040..720ed131189 100644 --- a/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt +++ b/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt @@ -26,7 +26,7 @@ project(performance_execution) # Source, headers, and include dirs set(SOURCE_FILES performance_odbc_execution.cpp) -include_directories(${ODFEODBC_SRC}) +include_directories(${OPENSEARCHODBC_SRC}) # Generate executable add_executable(performance_execution ${SOURCE_FILES}) diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt index 6abb2c1084a..f041072746f 100644 --- a/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt +++ b/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt @@ -28,7 +28,7 @@ project(performance_info) set(SOURCE_FILES performance_odbc_info.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ${RABBIT_SRC} ${RAPIDJSON_SRC}) diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt index 68776c9b209..c8eb83a11bd 100644 --- a/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt +++ b/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt @@ -28,7 +28,7 @@ project(performance_results) set(SOURCE_FILES performance_odbc_results.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable diff --git a/sql-odbc/src/PowerBIConnector/PBIDSExamples/odfesqlodbc_import.pbids b/sql-odbc/src/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids similarity index 100% rename from sql-odbc/src/PowerBIConnector/PBIDSExamples/odfesqlodbc_import.pbids rename to sql-odbc/src/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj index 543b5652c86..b2b177c461f 100644 --- a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj +++ b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj @@ -18,7 +18,7 @@ False 1000 Yes - OdfeSqlOdbcPBIConnector + SqlOdbcPBIConnector false @@ -36,31 +36,31 @@ - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code @@ -72,7 +72,7 @@ Content - + Code diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq index 8d2493f27f4..302f1468412 100644 --- a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq +++ b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq @@ -1,5 +1,5 @@ // This file contains Data Connector logic -section OdfeSqlOdbcPBIConnector; +section SqlOdbcPBIConnector; // When set to true, additional trace information will be written out to the User log. // This should be set to false before release. Tracing is done through a call to @@ -7,11 +7,11 @@ section OdfeSqlOdbcPBIConnector; // no-op and simply returns the original value. EnableTraceOutput = true; -[DataSource.Kind="OdfeSqlOdbcPBIConnector", Publish="OdfeSqlOdbcPBIConnector.Publish"] -shared OdfeSqlOdbcPBIConnector.Contents = Value.ReplaceType(OdfeSqlOdbcPBIConnectorImpl, OdfeSqlOdbcPBIConnectorType); +[DataSource.Kind="SqlOdbcPBIConnector", Publish="SqlOdbcPBIConnector.Publish"] +shared SqlOdbcPBIConnector.Contents = Value.ReplaceType(SqlOdbcPBIConnectorImpl, SqlOdbcPBIConnectorType); // Wrapper function to provide additional UI customization. -OdfeSqlOdbcPBIConnectorType = type function ( +SqlOdbcPBIConnectorType = type function ( Server as (type text meta [ Documentation.FieldCaption = "Server", Documentation.FieldDescription = "The hostname of the OpenSearch server.", @@ -22,7 +22,7 @@ OdfeSqlOdbcPBIConnectorType = type function ( Documentation.Name = "OpenSearch" ]; -OdfeSqlOdbcPBIConnectorImpl = (Server as text) as table => +SqlOdbcPBIConnectorImpl = (Server as text) as table => let Credential = Extension.CurrentCredential(), AuthenticationMode = Credential[AuthenticationKind], @@ -156,14 +156,14 @@ OnOdbcError = (errorRecord as record) => error errorRecord; // Data Source Kind description -OdfeSqlOdbcPBIConnector = [ +SqlOdbcPBIConnector = [ // Required for use with Power BI Service. TestConnection = (dataSourcePath) => let json = Json.Document(dataSourcePath), Server = json[Server] in - { "OdfeSqlOdbcPBIConnector.Contents", Server }, + { "SqlOdbcPBIConnector.Contents", Server }, // Authentication modes Authentication = [ @@ -185,7 +185,7 @@ OdfeSqlOdbcPBIConnector = [ GetDSR = (server, schema, object, optional options) => [ protocol = "sqlodbc", address = [ server = server ] ], GetFormula = (dsr, optional options) => () => let - db = OdfeSqlOdbcPBIConnector.Contents(dsr[address][server]) + db = SqlOdbcPBIConnector.Contents(dsr[address][server]) in db, GetFriendlyName = (dsr) => "OpenSearch SQL ODBC" @@ -199,7 +199,7 @@ OdfeSqlOdbcPBIConnector = [ ]; // Data Source UI publishing description -OdfeSqlOdbcPBIConnector.Publish = [ +SqlOdbcPBIConnector.Publish = [ Beta = true, Category = "Other", ButtonText = { Extension.LoadString("ButtonTitle"), Extension.LoadString("ButtonHelp") }, @@ -208,13 +208,13 @@ OdfeSqlOdbcPBIConnector.Publish = [ // Disabling direct query due to limited SQL query support SupportsDirectQuery = false, - SourceImage = OdfeSqlOdbcPBIConnector.Icons, - SourceTypeImage = OdfeSqlOdbcPBIConnector.Icons + SourceImage = SqlOdbcPBIConnector.Icons, + SourceTypeImage = SqlOdbcPBIConnector.Icons ]; -OdfeSqlOdbcPBIConnector.Icons = [ - Icon16 = { Extension.Contents("OdfeSqlOdbcPBIConnector16.png"), Extension.Contents("OdfeSqlOdbcPBIConnector20.png"), Extension.Contents("OdfeSqlOdbcPBIConnector24.png"), Extension.Contents("OdfeSqlOdbcPBIConnector32.png") }, - Icon32 = { Extension.Contents("OdfeSqlOdbcPBIConnector32.png"), Extension.Contents("OdfeSqlOdbcPBIConnector40.png"), Extension.Contents("OdfeSqlOdbcPBIConnector48.png"), Extension.Contents("OdfeSqlOdbcPBIConnector64.png") } +SqlOdbcPBIConnector.Icons = [ + Icon16 = { Extension.Contents("SqlOdbcPBIConnector16.png"), Extension.Contents("SqlOdbcPBIConnector20.png"), Extension.Contents("SqlOdbcPBIConnector24.png"), Extension.Contents("SqlOdbcPBIConnector32.png") }, + Icon32 = { Extension.Contents("SqlOdbcPBIConnector32.png"), Extension.Contents("SqlOdbcPBIConnector40.png"), Extension.Contents("SqlOdbcPBIConnector48.png"), Extension.Contents("SqlOdbcPBIConnector64.png") } ]; // Load common library functions diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq index def55af3e2c..bde4c98a34e 100644 --- a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq +++ b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq @@ -1,5 +1,5 @@ // This file contains queries to test your data connector -section OdfeSqlOdbcPBIConnector.UnitTests; +section SqlOdbcPBIConnector.UnitTests; shared MyExtension.UnitTest = [ @@ -12,7 +12,7 @@ shared MyExtension.UnitTest = Fact("Connection Test", 7, let - Source = OdfeSqlOdbcPBIConnector.Contents(Host,Port), + Source = SqlOdbcPBIConnector.Contents(Host,Port), no_of_columns = Table.ColumnCount(Source) in no_of_columns diff --git a/sql-odbc/src/PowerBIConnector/bin/Release/OdfeSqlOdbcPBIConnector.mez b/sql-odbc/src/PowerBIConnector/bin/Release/SqlOdbcPBIConnector.mez similarity index 100% rename from sql-odbc/src/PowerBIConnector/bin/Release/OdfeSqlOdbcPBIConnector.mez rename to sql-odbc/src/PowerBIConnector/bin/Release/SqlOdbcPBIConnector.mez diff --git a/sql-odbc/src/TableauConnector/odfe_sql_odbc/README.md b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/README.md similarity index 76% rename from sql-odbc/src/TableauConnector/odfe_sql_odbc/README.md rename to sql-odbc/src/TableauConnector/opensearch_sql_odbc/README.md index c1a8a8a9944..c136140744e 100644 --- a/sql-odbc/src/TableauConnector/odfe_sql_odbc/README.md +++ b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/README.md @@ -1,6 +1,6 @@ -## odfe_sql_odbc +## opensearch_sql_odbc -The connector files in `odfe_sql_odbc` can be used to connect to OpenSearch server in Tableau. +The connector files in `opensearch_sql_odbc` can be used to connect to OpenSearch server in Tableau. * These connector files remove and modify a set of unsupported functions and operations. * It includes set of capabilities to customize and tune connector behavior diff --git a/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/connection-dialog.tcd b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd similarity index 92% rename from sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/connection-dialog.tcd rename to sql-odbc/src/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd index 0f936b38617..f7ae8da2453 100644 --- a/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/connection-dialog.tcd +++ b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd @@ -1,4 +1,4 @@ - + diff --git a/sql-odbc/src/TableauConnector/odfe_sql_odbc/connectionBuilder.js b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionBuilder.js similarity index 100% rename from sql-odbc/src/TableauConnector/odfe_sql_odbc/connectionBuilder.js rename to sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionBuilder.js diff --git a/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/connectionResolver.tdr b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr similarity index 95% rename from sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/connectionResolver.tdr rename to sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr index 43eedb87717..68c376270c1 100644 --- a/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/connectionResolver.tdr +++ b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr @@ -1,5 +1,5 @@ - +