dprevot/php-pdo-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix two odbc version test

Browse source
This commit is contained in:
v-kaywon 2017-11-20 13:01:10 -08:00
parent be2f92ce04
commit d35087c608
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -3,10 +3,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
## Windows/Linux/macOS 5.1.2-preview - 2017-11-20
## Windows/Linux/macOS 5.1.2-preview - 2017-11-21
Updated PECL release packages. Here is the list of updates:
### Fixed
- Support for non-UTF8 locales in Linux and macOS
- Fixed crash caused by executing an invalid query in a transaction (Issue [#434](https://github.com/Microsoft/msphpsql/issues/434))
- Fixed regression in sqlsrv_next_result returning a no fields error when the active result set is null (Issue [#581](https://github.com/Microsoft/msphpsql/issues/581))
- Fixed incorrect active result set when sqlsrv_next_result or PDOStatement::nextRowset is called when Column Encryption is enabled (Issue [#574](https://github.com/Microsoft/msphpsql/issues/574))
@ -15,6 +16,7 @@ Updated PECL release packages. Here is the list of updates:
- Added error handling for binding TEXT, NTEXT or IMAGE as output parameter (Issue [#231](https://github.com/Microsoft/msphpsql/issues/231))
### Limitations
- In Linux and macOS, setlocale() only takes effect if it is invoked before the first connection. The subsequent locale setting will not work
- Always Encrypted functionalities are only supported using [MSODBC 17 preview](https://github.com/Microsoft/msphpsql/tree/dev/ODBC%2017%20binaries%20preview)
- ODBC binaries for macOS available upon request
- MSODBC 17 preview msodbcsql.msi only works in Windows10

6
test/functional/pdo_sqlsrv/pdo_connect_driver.phpt
View file

@ -52,6 +52,7 @@ function testValidValues()
case 17:
$value = "{ODBC Driver 17 for SQL Server}";
break;
case 14:
case 13:
$value = "{ODBC Driver 13 for SQL Server}";
break;
@ -60,7 +61,7 @@ function testValidValues()
$value = "{ODBC Driver 11 for SQL Server}";
break;
default:
$value = "invalid value";
$value = "invalid value $msodbcsqlMaj";
}
$connectionOptions = "Driver = $value";
connectVerifyOutput($connectionOptions);
@ -70,6 +71,7 @@ function testValidValues()
case 17:
$value = "ODBC Driver 17 for SQL Server";
break;
case 14:
case 13:
$value = "ODBC Driver 13 for SQL Server";
break;
@ -78,7 +80,7 @@ function testValidValues()
$value = "ODBC Driver 11 for SQL Server";
break;
default:
$value = "invalid value";
$value = "invalid value $msodbcsqlMaj";
}
$connectionOptions = "Driver = $value";

6
test/functional/sqlsrv/sqlsrv_connect_driver.phpt
View file

@ -44,6 +44,7 @@ function testValidValues($msodbcsqlMaj, $server, $connectionOptions)
case 17:
$value = "{ODBC Driver 17 for SQL Server}";
break;
case 14:
case 13:
$value = "{ODBC Driver 13 for SQL Server}";
break;
@ -52,7 +53,7 @@ function testValidValues($msodbcsqlMaj, $server, $connectionOptions)
$value = "{ODBC Driver 11 for SQL Server}";
break;
default:
$value = "invalid value";
$value = "invalid value $msodbcsqlMaj";
}
$connectionOptions['Driver']=$value;
connectVerifyOutput($server, $connectionOptions);
@ -62,6 +63,7 @@ function testValidValues($msodbcsqlMaj, $server, $connectionOptions)
case 17:
$value = "ODBC Driver 17 for SQL Server";
break;
case 14:
case 13:
$value = "ODBC Driver 13 for SQL Server";
break;
@ -70,7 +72,7 @@ function testValidValues($msodbcsqlMaj, $server, $connectionOptions)
$value = "ODBC Driver 11 for SQL Server";
break;
default:
$value = "invalid value";
$value = "invalid value $msodbcsqlMaj";
}
$connectionOptions['Driver']=$value;