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

Skipif fix #821

Merged
merged 5 commits into from
Jul 27, 2018
Merged

Skipif fix #821

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16c41e0
Merge pull request #1 from Microsoft/dev
david-puglielli Apr 1, 2017
36c45b6
Merge branch 'dev' of https://github.com/david-puglielli/msphpsql int…
david-puglielli Jul 20, 2018
f71c52d
Fixed skipifs for connres
david-puglielli Jul 23, 2018
efde09f
Tweaked per review comments
david-puglielli Jul 23, 2018
7357a16
One more fix
david-puglielli Jul 26, 2018
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
4 changes: 4 additions & 0 deletions test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ if (!$is_win) {
if ($msodbcsql_maj < 17 or $msodbcsql_min < 2) {
die("skip Unsupported ODBC driver version");
}
} else {
if ($msodbcsql_maj < 17) {
die("skip Unsupported ODBC driver version");
}
}

// Get SQL Server Version
Expand Down
4 changes: 4 additions & 0 deletions test/functional/sqlsrv/skipif_version_less_than_2k14.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ if (!$is_win) {
if ($msodbcsql_maj < 17 or $msodbcsql_min < 2) {
die("skip Unsupported ODBC driver version");
}
} else {
if ($msodbcsql_maj < 17) {
die("skip Unsupported ODBC driver version");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the else clause still necessary?

}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: change this to

if (!$is_win) {
    if ($msodbcsql_maj < 17) {
        die("skip Unsupported ODBC driver version");
    } else {
       // $msodbcsql_maj >= 17
       if ($msodbcsql_maj == 17 && $msodbcsql_min < 2 ) {
         die...
       } 
    }
}

}

// Get SQL Server version
Expand Down