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

Tests fixed, version updated

Browse source
This commit is contained in:
David Puglielli 2017-07-19 14:43:28 -07:00
parent ca4a2d9b7d
commit 9817f4d598
3 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
source/shared/version.h
View file

@ -1,58 +1,58 @@
#ifndef VERSION_H #ifndef VERSION_H
#define VERSION_H #define VERSION_H
//--------------------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------------------
// File: version.h // File: version.h
// Contents: Version number constants // Contents: Version number constants
// //
// Microsoft Drivers 4.3 for PHP for SQL Server // Microsoft Drivers 4.3 for PHP for SQL Server
// Copyright(c) Microsoft Corporation // Copyright(c) Microsoft Corporation
// All rights reserved. // All rights reserved.
// MIT License // MIT License
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files(the ""Software""), // Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files(the ""Software""),
// to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, // to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and / or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions : // and / or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions :
// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. // The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE. // IN THE SOFTWARE.
//--------------------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------------------
// helper macros to stringify the a macro value // helper macros to stringify the a macro value
#define STRINGIFY(a) TOSTRING(a) #define STRINGIFY(a) TOSTRING(a)
#define TOSTRING(a) #a #define TOSTRING(a) #a
// Increase Major number with backward incompatible breaking changes. // Increase Major number with backward incompatible breaking changes.
// Increase Minor with backward compatible new functionalities and API changes. // Increase Minor with backward compatible new functionalities and API changes.
// Increase Patch for backward compatible fixes. // Increase Patch for backward compatible fixes.
#define SQLVERSION_MAJOR 4 #define SQLVERSION_MAJOR 5
#define SQLVERSION_MINOR 3 #define SQLVERSION_MINOR 0
#define SQLVERSION_PATCH 0 #define SQLVERSION_PATCH 0
#define SQLVERSION_BUILD 0 #define SQLVERSION_BUILD 0
// Semantic versioning pre-release // Semantic versioning pre-release
// for stable releases should be empty // for stable releases should be empty
// "-RC" for release candidates // "-RC" for release candidates
// "-preview" for ETP // "-preview" for ETP
#define SEMVER_PRERELEASE #define SEMVER_PRERELEASE
// Semantic versioning build metadata, build meta data is not counted in precedence order. // Semantic versioning build metadata, build meta data is not counted in precedence order.
#define SEMVER_BUILDMETA #define SEMVER_BUILDMETA
#if SQLVERSION_BUILD > 0 #if SQLVERSION_BUILD > 0
#undef SEMVER_BUILDMETA #undef SEMVER_BUILDMETA
#define SEMVER_BUILDMETA "+" STRINGIFY( SQLVERSION_BUILD ) #define SEMVER_BUILDMETA "+" STRINGIFY( SQLVERSION_BUILD )
#endif #endif
// Main version, dot separated 3 digits, Major.Minor.Patch // Main version, dot separated 3 digits, Major.Minor.Patch
#define VER_APIVERSION_STR STRINGIFY( SQLVERSION_MAJOR ) "." STRINGIFY( SQLVERSION_MINOR ) "." STRINGIFY( SQLVERSION_PATCH ) #define VER_APIVERSION_STR STRINGIFY( SQLVERSION_MAJOR ) "." STRINGIFY( SQLVERSION_MINOR ) "." STRINGIFY( SQLVERSION_PATCH )
// Remove "-" if SEMVER_PRERELEASE is empty (for stable releases) // Remove "-" if SEMVER_PRERELEASE is empty (for stable releases)
#define VER_FILEVERSION_STR VER_APIVERSION_STR SEMVER_PRERELEASE SEMVER_BUILDMETA #define VER_FILEVERSION_STR VER_APIVERSION_STR SEMVER_PRERELEASE SEMVER_BUILDMETA
#define _FILEVERSION SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_PATCH,SQLVERSION_BUILD #define _FILEVERSION SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_PATCH,SQLVERSION_BUILD
// PECL package version macros (can't have '-' or '+') // PECL package version macros (can't have '-' or '+')
#define PHP_SQLSRV_VERSION VER_APIVERSION_STR SEMVER_PRERELEASE #define PHP_SQLSRV_VERSION VER_APIVERSION_STR SEMVER_PRERELEASE
#define PHP_PDO_SQLSRV_VERSION PHP_SQLSRV_VERSION #define PHP_PDO_SQLSRV_VERSION PHP_SQLSRV_VERSION
#endif // VERSION_H #endif // VERSION_H

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

@ -3,11 +3,11 @@ Provide name in lastInsertId to retrieve the last sequence number
--SKIPIF-- --SKIPIF--
--FILE-- --FILE--
<?php <?php
include 'pdo_tools.inc'; require_once("MsSetup.inc");
require_once("autonomous_setup.php");
try{ try{
$database = "tempdb"; $database = "tempdb";
$conn = new PDO("sqlsrv:Server=$serverName;Database=$database", $username, $password); $conn = new PDO("sqlsrv:Server=$serverName;Database=$databaseName", $username, $password);
// sequence is only supported in SQL server 2012 and up (or version 11 and up) // sequence is only supported in SQL server 2012 and up (or version 11 and up)
// Output Done once the server version is found to be < 11 // Output Done once the server version is found to be < 11

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

@ -3,11 +3,11 @@ LastInsertId returns the last sequences operating on the same table
--SKIPIF-- --SKIPIF--
--FILE-- --FILE--
<?php <?php
include 'pdo_tools.inc'; require_once("MsSetup.inc");
require_once("autonomous_setup.php");
try{ try{
$database = "tempdb"; $database = "tempdb";
$conn = new PDO("sqlsrv:Server=$serverName;Database=$database", $username, $password); $conn = new PDO("sqlsrv:Server=$server;Database=$databaseName", $username, $password);
// sequence is only supported in SQL server 2012 and up (or version 11 and up) // sequence is only supported in SQL server 2012 and up (or version 11 and up)
// Output Done once the server version is found to be < 11 // Output Done once the server version is found to be < 11