Skip to content

Commit

Permalink
Update version condition
Browse files Browse the repository at this point in the history
Signed-off-by: Rishabh Tanwar <[email protected]>
  • Loading branch information
ritanwar committed Mar 5, 2025
1 parent d2be537 commit 318211f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/composite-actions/build-extensions/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ runs:
cd ../babelfishpg_tsql
PG_CPPFLAGS='-I/usr/include -DENABLE_TDS_LIB -DENABLE_SPATIAL_TYPES' SHLIB_LINK='-lsybdb -L/usr/lib64' make
PG_CPPFLAGS='-I/usr/include -DENABLE_TDS_LIB -DENABLE_SPATIAL_TYPES' SHLIB_LINK='-lsybdb -L/usr/lib64' make install
shell: bash
shell: bash
9 changes: 7 additions & 2 deletions .github/composite-actions/build-modified-postgres/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,16 @@ runs:
- name: Build and Install the Modified PostgreSQL Instance and Run Tests
run: |
# Function to compare versions correctly
version_lt() {
version_le() {
printf "%s\n%s" "$1" "$2" | sort -V | head -n1 | grep -q "^$1$"
}
# Use gcc-9 for versions prior to 14.18, 15.13, 16.9 and 17.5
engine_version="${{ inputs.engine_version }}"
if [[ "$engine_version" != "source.latest" && "$engine_version" != "target.latest" ]] && version_lt "$engine_version" "17.5"; then
if [[ "$engine_version" != "source.latest" && "$engine_version" != "target.latest" ]] &&
( version_le "$engine_version" "14.17" ||
( [[ "${engine_version%%.*}" == "15" ]] && version_le "$engine_version" "15.12" ) ||
( [[ "${engine_version%%.*}" == "16" ]] && version_le "$engine_version" "16.8" ) ||
( [[ "${engine_version%%.*}" == "17" ]] && version_le "$engine_version" "17.4" ) ); then
export CC='ccache gcc-9'
else
export CC='ccache gcc'
Expand Down
2 changes: 1 addition & 1 deletion test/JDBC/jdbc_schedule
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

all

# TODO
ignore#!#charindex_and_replace_CIAI_collations

# TODO
# BABEL-SP_FKEYS test is very slow and causing github action timeout.

# JDBC bulk insert API seems to call SET FMTONLY ON without calling SET FMTONLY OFF, causing some spurious test failures.
Expand Down
3 changes: 2 additions & 1 deletion test/odbc/psqlodbc/test/tinyint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,8 @@ TEST_F(PSQL_DataTypes_TinyInt, View_Creation) {
dropObject(ServerType::PSQL, "TABLE", TABLE_NAME);
}

TEST_F(PSQL_DataTypes_TinyInt, Table_Unique_Constraints) {
// TODO: Re-enable when fixed
TEST_F(PSQL_DataTypes_TinyInt, DISABLED_Table_Unique_Constraints) {
const vector<pair<string, string>> TABLE_COLUMNS = {
{COL1_NAME, "INT"},
{COL2_NAME, DATATYPE_NAME}
Expand Down

0 comments on commit 318211f

Please sign in to comment.