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

Fixed build script and failing tests (#1268)

Browse source
This commit is contained in:
Jenny Tam 2021-06-10 17:59:08 -07:00 committed by GitHub
parent c91fe5c42b
commit d255591633
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildscripts/buildtools.py
View file

@ -99,7 +99,7 @@ class BuildUtil(object):
if self.vc == '': if self.vc == '':
VC = 'vc15' VC = 'vc15'
version = self.version_label() version = self.version_label()
if version == '80': # Compiler version for PHP 8.0 or above if version[0] == '8': # Compiler version for PHP 8.0 or above
VC = 'vs16' VC = 'vs16'
self.vc = VC self.vc = VC
print('Compiler: ' + self.vc) print('Compiler: ' + self.vc)

3
test/functional/pdo_sqlsrv/pdo_1261_test_ascii_utf8.phpt
View file

@ -24,8 +24,7 @@ try {
# SQLSRV_ATTR_ENCODING must be set to SQLSRV_ENCODING_SYSTEM (works with PDO::SQLSRV_ENCODING_UTF8) # SQLSRV_ATTR_ENCODING must be set to SQLSRV_ENCODING_SYSTEM (works with PDO::SQLSRV_ENCODING_UTF8)
# COLLATE must not be %UTF8% (e.g. Latin1_General_100_CI_AS_SC_UTF8 works) # COLLATE must not be %UTF8% (e.g. Latin1_General_100_CI_AS_SC_UTF8 works)
$sql = "DROP TABLE IF EXISTS #tmpTest; $sql = "SET NOCOUNT ON;
SET NOCOUNT ON;
DECLARE @val VARCHAR(8000) = REPLICATE('a', 2045) + 'ñ'; DECLARE @val VARCHAR(8000) = REPLICATE('a', 2045) + 'ñ';
CREATE TABLE #tmpTest (testCol VARCHAR(MAX) COLLATE SQL_Latin1_General_CP1_CI_AS); CREATE TABLE #tmpTest (testCol VARCHAR(MAX) COLLATE SQL_Latin1_General_CP1_CI_AS);
INSERT INTO #tmpTest (testCol) VALUES (@val); INSERT INTO #tmpTest (testCol) VALUES (@val);

11
test/functional/pdo_sqlsrv/pdo_test_TVP_bind_binary_values.phpt
View file

@ -5,7 +5,16 @@ Test Table-valued parameter using bindValue() instead of bindParam() with random
--ENV-- --ENV--
PHPT_EXEC=true PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<?php require('skipif.inc'); ?> <?php
if (!extension_loaded("pdo_sqlsrv")) {
die("skip Extension not loaded");
}
require_once('MsSetup.inc');
if ($localeDisabled) {
die("skip Locale not supported");
}
?>
--FILE-- --FILE--
<?php <?php
require_once('MsSetup.inc'); require_once('MsSetup.inc');

11
test/functional/sqlsrv/sqlsrv_test_TVP_query_binary_fields.phpt
View file

@ -5,7 +5,16 @@ Test Table-valued parameter using direct queries and sqlsrv_send_stream_data wit
--ENV-- --ENV--
PHPT_EXEC=true PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<?php require('skipif.inc'); ?> <?php
if (!extension_loaded("sqlsrv")) {
die("skip Extension not loaded");
}
require_once('MsSetup.inc');
if ($localeDisabled) {
die("skip Locale not supported");
}
?>
--FILE-- --FILE--
<?php <?php
require_once('MsCommon.inc'); require_once('MsCommon.inc');

3
test/functional/sqlsrv/srv_1261_test_ascii_utf8.phpt
View file

@ -17,8 +17,7 @@ $conn = connect(array("CharacterSet" => SQLSRV_ENC_CHAR));
# 'CharacterSet' connInfo must be set to SQLSRV_ENC_CHAR (works with UTF-8) # 'CharacterSet' connInfo must be set to SQLSRV_ENC_CHAR (works with UTF-8)
# COLLATE must not be %UTF8% (e.g. Latin1_General_100_CI_AS_SC_UTF8 works) # COLLATE must not be %UTF8% (e.g. Latin1_General_100_CI_AS_SC_UTF8 works)
$sql = "DROP TABLE IF EXISTS #tmpTest; $sql = "SET NOCOUNT ON;
SET NOCOUNT ON;
DECLARE @val VARCHAR(8000) = REPLICATE('a', 2045) + 'ñ'; DECLARE @val VARCHAR(8000) = REPLICATE('a', 2045) + 'ñ';
CREATE TABLE #tmpTest (testCol VARCHAR(MAX) COLLATE SQL_Latin1_General_CP1_CI_AS); CREATE TABLE #tmpTest (testCol VARCHAR(MAX) COLLATE SQL_Latin1_General_CP1_CI_AS);
INSERT INTO #tmpTest (testCol) VALUES (@val); INSERT INTO #tmpTest (testCol) VALUES (@val);