Skip to content

Commit

Permalink
Garya/ad 444/remove timestream connectivity (#16)
Browse files Browse the repository at this point in the history
* Update comment, replace 'timestreamodbc.c' with 'odbc.c'.

* Remove 'TOKEN' from MYLOG when logging authentication information.

* Add user input fields 'Username' and 'Password' when setting up DSN configuration.

* Modify DBCommunication methods Validate, Connect, ExecDirect.

Validation is true if username = 'testuser' and password = 'password'.
Connect returns true if validation is true (fake connection established).
ExecDirect returns false with error message 'No data available to query'.

* Update unit tests for valid username and password default authentication.

* Revert changes made to test_conn.cpp.

* Change 'username' to 'UID'.

* Revert DBCommunication::Validate method.

* Use environment variable NOT_CONNECTED for fake connection implementation.

* Change log message for connection established.

* Revert test_conn.cpp.

* Change 'Username' to 'User ID'.

* Check env variables for DBCommunication Connect, Disconnect, ExecDirect).

* Update connection unit tests.

* Update it_odbc_helper.(h,cpp) file for default unit tests.

* Minor changes to DBCommunication class.

* Update unit tests for odbc connection.

* Remove printf statement from test_odbc_connection.cpp.

* Remove Tableau query unit tests.

* Remove NOT_CONNECTED check in class Fixture.

* Add NOT_CONNECTED check in derived test classes, remove from unit test functions.

* Update TestSQLDriverMultiConnection.

* Format documents google style.

* Update .yml files with FAKE_CONNECTION: 1.

* Remove NOT_CONNECTED from DBCommunication class.

* Move database connection check from unit test to unit test class.

Remove expected error check in unit tests for the case
NOT_CONNECTED = 0 and FAKE_CONNECTION = 0.

* Move database connection check from unit test to unit test class.

Remove expected error check in unit tests for the case
NOT_CONNECTED = 0 and FAKE_CONNECTION = 0.

* Comment out SQLDisconnect unit tests with reconnections due to memory dump.

* Update Github actions (macos, linux) to use cmake version 3.21.4.

* Update Github actions (macos, linux) to use cmake version 3.21.4.

* Update linux32 to use cmake 3.21.4.

* [AD-444] Set the password field on the DSN dialog to hide typed characters.
https:/bitquill.atlassian.net/browse/AD-444

* Revert "Remove Tableau query unit tests."

This reverts commit 876e29e13203463d35359513fe4788d286cb9da5.

* Fix memory leak for TestSQLDisconnect.

* [AD-477] add TODO comments for instructions on modifying connection string in future.

* Update github actions cmake to 3.21.4 using = and @ symbol.

* Revert "Update github actions cmake to 3.21.4 using = and @ symbol."

This reverts commit 4f1e7057472a3d81a6de025e397d267c2eebe781.

Co-authored-by: Bruce Irschick <[email protected]>
  • Loading branch information
garya-bitquill and Bruce Irschick authored Dec 4, 2021
1 parent 16d870e commit e53b93f
Show file tree
Hide file tree
Showing 26 changed files with 1,485 additions and 2,059 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@ env:
ODBC_BUILD_PATH: "./build/odbc/build"
AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
NOT_CONNECTED: 1
FAKE_CONNECTION: 1

jobs:
build-linux64:
runs-on: ubuntu-latest
steps:
- name: Setup cmake
uses: jwlawson/[email protected]
with:
cmake-version: '3.21.4'
- uses: actions/checkout@v2
- name: run-cppcheck
run: |
Expand All @@ -37,7 +42,7 @@ jobs:
if: success()
run: |
sudo apt update
sudo apt install libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev libpulse-dev linux-headers-$(uname -r) gcc gcc-multilib g++ g++-multilib cmake linux-headers-$(uname -r) build-essential valgrind
sudo apt install libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev libpulse-dev linux-headers-$(uname -r) gcc gcc-multilib g++ g++-multilib linux-headers-$(uname -r) build-essential valgrind
- name: prepare-dsn
if: success()
run: |
Expand Down Expand Up @@ -96,6 +101,10 @@ jobs:
build-linux32:
runs-on: ubuntu-latest
steps:
- name: Setup cmake
uses: jwlawson/[email protected]
with:
cmake-version: '3.21.4'
- uses: actions/checkout@v2
- name: run-cppcheck
run: |
Expand All @@ -113,7 +122,7 @@ jobs:
# Need to install i386 versions
sudo dpkg --add-architecture i386
sudo apt update
sudo apt install unixodbc:i386 unixodbc-dev:i386 odbcinst1debian2:i386 libodbc1:i386 libcurl4-openssl-dev:i386 libssl-dev:i386 uuid-dev:i386 cpp:i386 cpp-9:i386 gcc:i386 g++:i386 zlib1g-dev:i386 linux-headers-$(uname -r) gcc-multilib:i386 g++-multilib:i386 cmake g++-9:i386 gcc-9:i386 gcc-9-multilib:i386 g++-9-multilib:i386 binutils:i386 make:i386
sudo apt install unixodbc:i386 unixodbc-dev:i386 odbcinst1debian2:i386 libodbc1:i386 libcurl4-openssl-dev:i386 libssl-dev:i386 uuid-dev:i386 cpp:i386 cpp-9:i386 gcc:i386 g++:i386 zlib1g-dev:i386 linux-headers-$(uname -r) gcc-multilib:i386 g++-multilib:i386 g++-9:i386 gcc-9:i386 gcc-9-multilib:i386 g++-9-multilib:i386 binutils:i386 make:i386
- name: prepare-dsn
if: success()
run: |
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/mac-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@ env:
ODBC_BUILD_PATH: "./build/odbc/build"
AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
NOT_CONNECTED: 1
FAKE_CONNECTION: 1

jobs:
build-mac:
runs-on: macos-latest
steps:
- name: Setup cmake
uses: jwlawson/[email protected]
with:
cmake-version: '3.21.4'
- uses: actions/checkout@v2
- name: run-cppcheck
run: |
Expand All @@ -37,7 +42,6 @@ jobs:
run: |
brew unlink unixodbc
brew install curl
brew install cmake
brew install libiodbc
- name: configure-and-build-driver
run: |
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/mac-debug-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,19 @@ env:
ODBC_BUILD_PATH: "./build/odbc/build"
AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
NOT_CONNECTED: 1
FAKE_CONNECTION: 1

jobs:
build-mac:
runs-on: macos-latest
env:
NOT_CONNETECD: 1
FAKE_CONNECTION: 1
steps:
- name: Setup cmake
uses: jwlawson/[email protected]
with:
cmake-version: '3.21.4'
- uses: actions/checkout@v2
- name: run-cppcheck
run: |
Expand All @@ -32,7 +38,6 @@ jobs:
run: |
brew unlink unixodbc
brew install curl
brew install cmake
brew install libiodbc
- name: set-PATH
run: |
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/release-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ jobs:
build-mac:
runs-on: macos-latest
steps:
- name: Setup cmake
uses: jwlawson/[email protected]
with:
cmake-version: '3.21.4'
- uses: actions/checkout@v2
- name: run-cppcheck
run: |
Expand All @@ -31,7 +35,6 @@ jobs:
run: |
brew unlink unixodbc
brew install curl
brew install cmake
brew install libiodbc
- name: configure-and-build-driver
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/win-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ env:
ODBC_BUILD_PATH: "./build/odbc/build"
AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
NOT_CONNECTED: 1
FAKE_CONNECTION: 1

jobs:
build-windows32:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/win-debug-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
ODBC_BUILD_PATH: "./build/odbc/build"
AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
NOT_CONNECTED: 1
FAKE_CONNECTION: 1

jobs:
build-windows32:
Expand Down
Loading

0 comments on commit e53b93f

Please sign in to comment.