diff --git a/source/shared/version.h b/source/shared/version.h index ba205053..b26accd7 100644 --- a/source/shared/version.h +++ b/source/shared/version.h @@ -1,58 +1,58 @@ -#ifndef VERSION_H -#define VERSION_H -//--------------------------------------------------------------------------------------------------------------------------------- -// File: version.h -// Contents: Version number constants -// -// Microsoft Drivers 4.3 for PHP for SQL Server -// Copyright(c) Microsoft Corporation -// All rights reserved. -// MIT License -// 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, -// 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 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 -// 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. -//--------------------------------------------------------------------------------------------------------------------------------- - -// helper macros to stringify the a macro value -#define STRINGIFY(a) TOSTRING(a) -#define TOSTRING(a) #a - - -// Increase Major number with backward incompatible breaking changes. -// Increase Minor with backward compatible new functionalities and API changes. -// Increase Patch for backward compatible fixes. -#define SQLVERSION_MAJOR 4 -#define SQLVERSION_MINOR 3 -#define SQLVERSION_PATCH 0 -#define SQLVERSION_BUILD 0 - -// Semantic versioning pre-release -// for stable releases should be empty -// "-RC" for release candidates -// "-preview" for ETP -#define SEMVER_PRERELEASE -// Semantic versioning build metadata, build meta data is not counted in precedence order. -#define SEMVER_BUILDMETA - -#if SQLVERSION_BUILD > 0 -#undef SEMVER_BUILDMETA -#define SEMVER_BUILDMETA "+" STRINGIFY( SQLVERSION_BUILD ) -#endif - -// Main version, dot separated 3 digits, Major.Minor.Patch -#define VER_APIVERSION_STR STRINGIFY( SQLVERSION_MAJOR ) "." STRINGIFY( SQLVERSION_MINOR ) "." STRINGIFY( SQLVERSION_PATCH ) - -// Remove "-" if SEMVER_PRERELEASE is empty (for stable releases) -#define VER_FILEVERSION_STR VER_APIVERSION_STR SEMVER_PRERELEASE SEMVER_BUILDMETA -#define _FILEVERSION SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_PATCH,SQLVERSION_BUILD - -// PECL package version macros (can't have '-' or '+') -#define PHP_SQLSRV_VERSION VER_APIVERSION_STR SEMVER_PRERELEASE -#define PHP_PDO_SQLSRV_VERSION PHP_SQLSRV_VERSION - -#endif // VERSION_H +#ifndef VERSION_H +#define VERSION_H +//--------------------------------------------------------------------------------------------------------------------------------- +// File: version.h +// Contents: Version number constants +// +// Microsoft Drivers 4.3 for PHP for SQL Server +// Copyright(c) Microsoft Corporation +// All rights reserved. +// MIT License +// 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, +// 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 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 +// 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. +//--------------------------------------------------------------------------------------------------------------------------------- + +// helper macros to stringify the a macro value +#define STRINGIFY(a) TOSTRING(a) +#define TOSTRING(a) #a + + +// Increase Major number with backward incompatible breaking changes. +// Increase Minor with backward compatible new functionalities and API changes. +// Increase Patch for backward compatible fixes. +#define SQLVERSION_MAJOR 5 +#define SQLVERSION_MINOR 0 +#define SQLVERSION_PATCH 0 +#define SQLVERSION_BUILD 0 + +// Semantic versioning pre-release +// for stable releases should be empty +// "-RC" for release candidates +// "-preview" for ETP +#define SEMVER_PRERELEASE +// Semantic versioning build metadata, build meta data is not counted in precedence order. +#define SEMVER_BUILDMETA + +#if SQLVERSION_BUILD > 0 +#undef SEMVER_BUILDMETA +#define SEMVER_BUILDMETA "+" STRINGIFY( SQLVERSION_BUILD ) +#endif + +// Main version, dot separated 3 digits, Major.Minor.Patch +#define VER_APIVERSION_STR STRINGIFY( SQLVERSION_MAJOR ) "." STRINGIFY( SQLVERSION_MINOR ) "." STRINGIFY( SQLVERSION_PATCH ) + +// Remove "-" if SEMVER_PRERELEASE is empty (for stable releases) +#define VER_FILEVERSION_STR VER_APIVERSION_STR SEMVER_PRERELEASE SEMVER_BUILDMETA +#define _FILEVERSION SQLVERSION_MAJOR,SQLVERSION_MINOR,SQLVERSION_PATCH,SQLVERSION_BUILD + +// PECL package version macros (can't have '-' or '+') +#define PHP_SQLSRV_VERSION VER_APIVERSION_STR SEMVER_PRERELEASE +#define PHP_PDO_SQLSRV_VERSION PHP_SQLSRV_VERSION + +#endif // VERSION_H diff --git a/test/functional/pdo_sqlsrv/pdo_278_lastinsertid_seq.phpt b/test/functional/pdo_sqlsrv/pdo_278_lastinsertid_seq.phpt index 5b8dd8b9..1d60fb61 100644 --- a/test/functional/pdo_sqlsrv/pdo_278_lastinsertid_seq.phpt +++ b/test/functional/pdo_sqlsrv/pdo_278_lastinsertid_seq.phpt @@ -3,11 +3,11 @@ Provide name in lastInsertId to retrieve the last sequence number --SKIPIF-- --FILE--