Fixed build script and failing tests (#1268)
This commit is contained in:
parent
c91fe5c42b
commit
d255591633
|
@ -99,7 +99,7 @@ class BuildUtil(object):
|
|||
if self.vc == '':
|
||||
VC = 'vc15'
|
||||
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'
|
||||
self.vc = VC
|
||||
print('Compiler: ' + self.vc)
|
||||
|
|
|
@ -24,8 +24,7 @@ try {
|
|||
# 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)
|
||||
|
||||
$sql = "DROP TABLE IF EXISTS #tmpTest;
|
||||
SET NOCOUNT ON;
|
||||
$sql = "SET NOCOUNT ON;
|
||||
DECLARE @val VARCHAR(8000) = REPLICATE('a', 2045) + 'ñ';
|
||||
CREATE TABLE #tmpTest (testCol VARCHAR(MAX) COLLATE SQL_Latin1_General_CP1_CI_AS);
|
||||
INSERT INTO #tmpTest (testCol) VALUES (@val);
|
||||
|
|
|
@ -5,7 +5,16 @@ Test Table-valued parameter using bindValue() instead of bindParam() with random
|
|||
--ENV--
|
||||
PHPT_EXEC=true
|
||||
--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--
|
||||
<?php
|
||||
require_once('MsSetup.inc');
|
||||
|
|
|
@ -5,7 +5,16 @@ Test Table-valued parameter using direct queries and sqlsrv_send_stream_data wit
|
|||
--ENV--
|
||||
PHPT_EXEC=true
|
||||
--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--
|
||||
<?php
|
||||
require_once('MsCommon.inc');
|
||||
|
|
|
@ -17,8 +17,7 @@ $conn = connect(array("CharacterSet" => SQLSRV_ENC_CHAR));
|
|||
# '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)
|
||||
|
||||
$sql = "DROP TABLE IF EXISTS #tmpTest;
|
||||
SET NOCOUNT ON;
|
||||
$sql = "SET NOCOUNT ON;
|
||||
DECLARE @val VARCHAR(8000) = REPLICATE('a', 2045) + 'ñ';
|
||||
CREATE TABLE #tmpTest (testCol VARCHAR(MAX) COLLATE SQL_Latin1_General_CP1_CI_AS);
|
||||
INSERT INTO #tmpTest (testCol) VALUES (@val);
|
||||
|
|
Loading…
Reference in a new issue