diff --git a/appveyor.yml b/appveyor.yml index 8f81e3d4..d123fbd4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,19 +22,19 @@ environment: BUILD_PLATFORM: x64 TEST_PHP_SQL_SERVER: (local)\SQL2017 SQL_INSTANCE: SQL2017 - PHP_VC: 15 - PHP_MAJOR_VER: 7.3 + PHP_VC: vc15 + PHP_MAJOR_VER: 7.4 PHP_MINOR_VER: latest PHP_EXE_PATH: x64\Release_TS THREAD: ts platform: x64 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 BUILD_PLATFORM: x86 - TEST_PHP_SQL_SERVER: (local)\SQL2016 - SQL_INSTANCE: SQL2016 - PHP_VC: 15 - PHP_MAJOR_VER: 7.4 - PHP_MINOR_VER: latest + TEST_PHP_SQL_SERVER: (local)\SQL2019 + SQL_INSTANCE: SQL2019 + PHP_VC: vs16 + PHP_MAJOR_VER: 8.0 + PHP_MINOR_VER: 0beta1 PHP_EXE_PATH: Release THREAD: nts platform: x86 @@ -83,7 +83,7 @@ install: } - echo Downloading MSODBCSQL 17 # AppVeyor build works are x64 VMs and 32-bit ODBC driver cannot be installed on it - - ps: (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/E/6/B/E6BFDC7A-5BCD-4C51-9912-635646DA801E/en-US/17.5.2.1/x64/msodbcsql.msi', 'c:\projects\msodbcsql.msi') + - ps: (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/6/b/3/6b3dd05c-678c-4e6b-b503-1d66e16ef23d/en-US/17.6.1.1/x64/msodbcsql.msi', 'c:\projects\msodbcsql.msi') - cmd /c start /wait msiexec /i "c:\projects\msodbcsql.msi" /q IACCEPTMSODBCSQLLICENSETERMS=YES ADDLOCAL=ALL - echo Checking the version of MSODBCSQL - reg query "HKLM\SOFTWARE\ODBC\odbcinst.ini\ODBC Driver 17 for SQL Server" @@ -106,7 +106,7 @@ build_script: - cd c:\projects - python -V - python builddrivers.py --PHPVER=%PHP_VERSION% --ARCH=%BUILD_PLATFORM% --THREAD=%THREAD% --SOURCE=%APPVEYOR_BUILD_FOLDER%\source --TESTING --NO_RENAME - - cd c:\projects\php-sdk\phpdev\vc%PHP_VC%\%BUILD_PLATFORM%\php-%PHP_VERSION%-src\ + - cd c:\projects\php-sdk\phpdev\%PHP_VC%\%BUILD_PLATFORM%\php-%PHP_VERSION%-src\ - set PHP_SRC_DIR=%CD%\ext - cd %PHP_EXE_PATH% - set PHP_EXE_PATH=%CD% diff --git a/test/functional/sqlsrv/MsHelper.inc b/test/functional/sqlsrv/MsHelper.inc index 2058e5e0..590e8b33 100644 --- a/test/functional/sqlsrv/MsHelper.inc +++ b/test/functional/sqlsrv/MsHelper.inc @@ -1088,7 +1088,7 @@ function getColSize($k) case 19: return ("1073741823"); case 20: return ("512"); case 21: return ("512"); - case 22: return ("0)"); + case 22: return ("0"); case 23: return ("2147483647"); case 24: return ("36"); //case 25: return ("23"); @@ -1097,7 +1097,7 @@ function getColSize($k) case 28: return ("0"); default: break; } - return (""); + return NULL; } function getColPrecision($k) diff --git a/test/functional/sqlsrv/sqlsrv_378_out_param_error.phpt b/test/functional/sqlsrv/sqlsrv_378_out_param_error.phpt index a0169225..27942a21 100644 --- a/test/functional/sqlsrv/sqlsrv_378_out_param_error.phpt +++ b/test/functional/sqlsrv/sqlsrv_378_out_param_error.phpt @@ -78,7 +78,7 @@ function executeSP($conn, $procName, $noRef, $prepare) $expected = 3; $v1 = 1; $v2 = 2; - $v3 = 'str'; + $v3 = 0; $res = true; $tsql = "{call $procName( ?, ?, ?)}";