Odbc 172 update for connres and appveyor #814
Conversation
Codecov Report
@@ Coverage Diff @@
## dev #814 +/- ##
=======================================
Coverage 80.06% 80.06%
=======================================
Files 25 25
Lines 7325 7325
=======================================
Hits 5865 5865
Misses 1460 1460Continue to review full report at Codecov.
|
| @@ -7,7 +7,8 @@ killing the connection and then not freeing it. The latter case is the only one | |||
| that should fail. Finally, execute two queries in two threads on a recovered | |||
| non-MARS connection. This should fail too. | |||
| --SKIPIF-- | |||
| <?php require('skipif_protocol_not_tcp.inc'); | |||
| <?php require('skipif_mid-refactor.inc'); | |||
| require('skipif_protocol_not_tcp.inc'); | |||
| require('skipif_version_less_than_2k14.inc'); ?> | |||
| --FILE-- | |||
There was a problem hiding this comment.
maybe put skipif_mid-refactor.inc to the end? because it skips sql server < 2016?
There was a problem hiding this comment.
skipif_mid-refactor doesn't skip any SQL Server unless AE is set, in which case it will skip versions < 2016. That's what we want isn't it?
| @@ -1,7 +1,7 @@ | |||
| --TEST-- | |||
| Test the connection resiliency keywords ConnectRetryCount and ConnectRetryInterval and their ranges of acceptable values | |||
| --SKIPIF-- | |||
| <?php require('skipif_unix.inc'); | |||
| <?php require('skipif_mid-refactor.inc'); | |||
| require('skipif_version_less_than_2k14.inc'); ?> | |||
| --FILE-- | |||
There was a problem hiding this comment.
See my comment earlier about skipif_mid-refactor.inc
| @@ -5,7 +5,8 @@ Prepare a statement, break the connection, and execute the statement. Then | |||
| test transactions by breaking the connection before beginning a transaction | |||
| and in the middle of the transaction. The latter case should fail. | |||
| --SKIPIF-- | |||
| <?php require('skipif_protocol_not_tcp.inc'); | |||
| <?php require('skipif_mid-refactor.inc'); | |||
| require('skipif_protocol_not_tcp.inc'); | |||
| require('skipif_version_less_than_2k14.inc'); ?> | |||
There was a problem hiding this comment.
same here... otherwise, this test will be skipped even when running against sql server 2014
| @@ -4,7 +4,8 @@ Test connection resiliency timeouts | |||
| 1. Connect with ConnectRetryCount equal to 0. | |||
| 2. Reconnect with the default value of ConnectRetryCount(1). | |||
| --SKIPIF-- | |||
| <?php require('skipif_protocol_not_tcp.inc'); | |||
| <?php require('skipif_mid-refactor.inc'); | |||
| require('skipif_protocol_not_tcp.inc'); | |||
| require('skipif_version_less_than_2k14.inc'); ?> | |||
| @@ -1,6 +1,4 @@ | |||
| <?php | |||
| if ( !( strtoupper( substr( php_uname( 's' ),0,3 ) ) === 'WIN' ) ) die( "Skip Test on windows only." ); | |||
|
|
|||
There was a problem hiding this comment.
Does this one and the equivalent one for 2k14 need to check ODBC version? only works for 17.2 right?
| @@ -2,6 +2,7 @@ | |||
| Test the Authentication keyword and three options: SqlPassword, ActiveDirectoryIntegrated, and ActiveDirectoryPassword. | |||
| --SKIPIF-- | |||
| <?php require('skipif.inc'); | |||
| require('skipif_unix.phpt'); | |||
| require('skipif_version_less_than_2k16.inc'); ?> | |||
There was a problem hiding this comment.
I think starting with ODBC 17 Azure AD works outside Windows too.
|
For some reason it's called $DriverName in MsSetup.inc instead of $driver. I'll fix it. |
|
@david-puglielli $DriverName is only in pdo's MsSetup.inc, and I don't know what its use for. |
… 17.2
This change is