Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Reverted UseSSL flag to false and removed invalid test case #671

Merged
merged 2 commits into from
Jul 7, 2022
Merged

Reverted UseSSL flag to false and removed invalid test case #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9f146a
Reverted the default value of USE_SSL to false and removed invalid te…
forestmvey Jun 29, 2022
5146084
Merge pull request #84 from Bit-Quill/dev-odbc_ssl_default_off_fix
forestmvey Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc_connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,26 +283,6 @@ TEST_F(TestSQLDriverConnect, ConnStringAbbrevsUIDPWD) {
EXPECT_EQ(SQL_SUCCESS, ret);
}

TEST_F(TestSQLDriverConnect, ConnStringAbbrevsHostMixedProtocol) {
std::wstring abbrev_str =
use_ssl ? L"Driver={OpenSearch ODBC};"
L"host=http://localhost;port=9200;"
L"UID=admin;PWD=admin;auth=BASIC;useSSL=1;"
L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
L"responseTimeout=10;"
: L"Driver={OpenSearch ODBC};"
L"host=https://localhost;port=9200;"
L"UID=admin;PWD=admin;auth=BASIC;useSSL=0;"
L"hostnameVerification=0;logLevel=0;logOutput=C:\\;"
L"responseTimeout=10;";

SQLRETURN ret =
SQLDriverConnect(m_conn, NULL, (SQLTCHAR*)abbrev_str.c_str(), SQL_NTS,
m_out_conn_string, IT_SIZEOF(m_out_conn_string),
&m_out_conn_string_length, SQL_DRIVER_NOPROMPT);
EXPECT_EQ(SQL_ERROR, ret);
}

TEST_F(TestSQLDriverConnect, ConnStringAbbrevsHost) {
std::wstring abbrev_str =
use_ssl ? L"Driver={OpenSearch ODBC};"
Expand Down
2 changes: 1 addition & 1 deletion sql-odbc/src/sqlodbc/dlg_specific.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ extern "C" {
#define DEFAULT_BOOLSASCHAR 0
#define DEFAULT_UNIQUEINDEX 1 /* dont recognize */
#define DEFAULT_LOGLEVEL OPENSEARCH_WARNING
#define DEFAULT_USE_SSL 1
#define DEFAULT_USE_SSL 0
#define DEFAULT_TRUST_SELF_SIGNED 0
#define DEFAULT_AUTH_MODE "NONE"
#define DEFAULT_REGION ""
Expand Down