diff --git a/sql-odbc/.gitignore b/sql-odbc/.gitignore index 6f408e7c21..4202615e96 100644 --- a/sql-odbc/.gitignore +++ b/sql-odbc/.gitignore @@ -42,8 +42,8 @@ LICENSE.txt /googletest/ /installer/ /IntegrationTests/ -/odfeenlist/ -/odfesqlodbc/ +/opensearchenlist/ +/sqlodbc/ /PerformanceTests/ /UnitTests/ *.filters diff --git a/sql-odbc/README.md b/sql-odbc/README.md index 69fd9c8638..0610caf305 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 @@ -48,8 +48,8 @@ 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` -* Mac: `libodfesqlodbc.dylib` +* 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 16c642c633..dfd3d771e0 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 @@ -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/dev/run_tests.md b/sql-odbc/docs/dev/run_tests.md index 3072e6551b..95e166e30f 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/mac_configure_dsn.md b/sql-odbc/docs/user/mac_configure_dsn.md index 30414ccac5..10c82d3e24 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/docs/user/microsoft_excel_support_mac.md b/sql-odbc/docs/user/microsoft_excel_support_mac.md index 11d3d7ede4..7b7f829f2e 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 66c9e647b1..eba07e0b53 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/) -* Optional: [odfesqlodbc_import.pbids](../../src/PowerBIConnector/PBIDSExamples) to help with repeated connections to the same server +* [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. @@ -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" } @@ -74,12 +74,12 @@ Example PBIDS file for OpenSearch: (available here: [odfesqlodbc_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 1c0cea4a65..f96c0612d0 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 6d5dd80a92..fd24ea9e8f 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}/odfesqlodbc") -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/DSNInstaller/dsn_installer.cpp b/sql-odbc/src/DSNInstaller/dsn_installer.cpp index 6551cab90f..50942fcb6b 100644 --- a/sql-odbc/src/DSNInstaller/dsn_installer.cpp +++ b/sql-odbc/src/DSNInstaller/dsn_installer.cpp @@ -40,9 +40,9 @@ 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"; +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 142ae68c1f..30def0b034 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} ) @@ -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/ITODBCAwsAuth/test_aws_auth_dsn.reg b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg index 872dec2d3a..10bd4bee49 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/ITODBCAwsAuth/test_odbcinst.ini b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini index 03aedf8bb1..bb43dd526e 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/ITODBCCatalog/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt index c4beeb2aa0..ff4f78f022 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 @@ -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/ITODBCCatalog/test_odbc_catalog.cpp b/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp index 4c825fdf12..f53f7b90d6 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 69b8b74fc7..3f412af670 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 @@ -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/ITODBCConnection/test_dsn.reg b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg index cfdfffaa7e..5fbdc93f42 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/ITODBCConnection/test_odbcinst.ini b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbcinst.ini index 9868d27e06..9b0084a4b1 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/ITODBCDescriptors/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt index 95826369e8..868e653654 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 @@ -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 3b8825324f..64709db087 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt +++ b/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt @@ -28,12 +28,12 @@ project(itodbc_execution) set(SOURCE_FILES test_odbc_execution.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable 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 c0cc86ef56..d61ac37f22 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} ) @@ -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 fc9619a0f6..6db8cac100 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 @@ -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/ITODBCInfo/test_odbc_info.cpp b/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp index 0f08433e0c..fd8379d4fe 100644 --- a/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp +++ b/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp @@ -149,9 +149,9 @@ 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"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/IntegrationTests/ITODBCPagination/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt index 4f5acc616d..c1f93d5117 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 @@ -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 c30e195332..360d6c9906 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 @@ -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 9b1beff5b0..88fff768d9 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 @@ -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 c8f48b9f38..720ed13118 100644 --- a/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt +++ b/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt @@ -26,11 +26,11 @@ 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}) # 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 c51eff6b61..f041072746 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}) @@ -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 2149f8a792..c8eb83a11b 100644 --- a/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt +++ b/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt @@ -28,12 +28,12 @@ project(performance_results) set(SOURCE_FILES performance_odbc_results.cpp) include_directories( ${UT_HELPER} ${IT_HELPER} - ${ODFEODBC_SRC} + ${OPENSEARCHODBC_SRC} ${VLD_SRC} ) # Generate executable 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/sqlodbc_import.pbids similarity index 84% rename from sql-odbc/src/PowerBIConnector/PBIDSExamples/odfesqlodbc_import.pbids rename to sql-odbc/src/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids index f567a76409..1b10587631 100644 --- a/sql-odbc/src/PowerBIConnector/PBIDSExamples/odfesqlodbc_import.pbids +++ b/sql-odbc/src/PowerBIConnector/PBIDSExamples/sqlodbc_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 88% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.mproj rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj index 543b5652c8..b2b177c461 100644 --- a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.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/OdfeSqlOdbcPBIConnector.pq b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq similarity index 87% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.pq rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq index f72ec09ee0..302f146841 100644 --- a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.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 = [ @@ -181,11 +181,11 @@ 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]) + 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/OdfeSqlOdbcPBIConnector.query.pq b/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq similarity index 99% rename from sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.query.pq rename to sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq index def55af3e2..bde4c98a34 100644 --- a/sql-odbc/src/PowerBIConnector/OdfeSqlOdbcPBIConnector.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/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/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 c1a8a8a994..c136140744 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/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/connection-dialog.tcd rename to sql-odbc/src/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd index 2ac573f598..f7ae8da245 100644 --- a/sql-odbc/src/TableauConnector/odfe_sql_odbc/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/connectionResolver.tdr b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr similarity index 95% rename from sql-odbc/src/TableauConnector/odfe_sql_odbc/connectionResolver.tdr rename to sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr index 4cf2971019..68c376270c 100644 --- a/sql-odbc/src/TableauConnector/odfe_sql_odbc/connectionResolver.tdr +++ b/sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr @@ -1,5 +1,5 @@ - +