Fix support for sqlsrv and pdo_sqlsrv

This commit is contained in:
Shivam Mathur 2024-04-24 03:05:05 +05:30
parent efffd0e4f2
commit 14d9660823
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
2 changed files with 21 additions and 14 deletions

View File

@ -66,7 +66,7 @@ Function Enable-Extension() {
}
# Function to add custom built PHP extension for nightly builds.
Function Add-NightlyExtension {
Function Add-ExtensionFromGithub {
Param (
[Parameter(Position = 0, Mandatory = $true)]
[ValidateNotNull()]
@ -123,7 +123,7 @@ Function Add-Extension {
}
else {
if(($version -match $nightly_versions) -and (Select-String -Path $src\configs\windows_extensions -Pattern $extension -SimpleMatch -Quiet)) {
Add-NightlyExtension $extension
Add-ExtensionFromGithub $extension
} else {
# Patch till DLLs for PHP 8.1 and above are released as stable.
$minimumStability = $stability

View File

@ -29,7 +29,7 @@ Function Get-SqlsrvReleaseUrl()
}
# Function to add sqlsrv extension from GitHub.
Function Add-SqlsrvFromGithub()
Function Add-SqlsrvFromMSGithub()
{
Param (
[Parameter(Position = 0, Mandatory = $true)]
@ -37,6 +37,7 @@ Function Add-SqlsrvFromGithub()
[string]
$extension
)
try {
$zipUrl = SqlsrvReleaseUrl
if($zipUrl) {
$nts = if (!$installed.ThreadSafe) { "nts" } else { "ts" }
@ -47,6 +48,7 @@ Function Add-SqlsrvFromGithub()
Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\sqlsrv\$extensionFilePath" -Destination "$ext_dir\php_$extension.dll"
Enable-PhpExtension -Extension $extension -Path $php_dir
}
} catch { }
}
# Function to add sqlsrv extension.
@ -61,7 +63,12 @@ Function Add-Sqlsrv() {
if (Test-Path $ext_dir\php_$extension.dll) {
Enable-PhpExtension -Extension $extension -Path $php_dir
} else {
Add-SqlsrvFromGithub $extension >$null 2>&1
try {
Add-ExtensionFromGithub $extension > $null 2>&1
} catch {}
if (-not(Test-Extension $extension)) {
Add-SqlsrvFromMSGithub $extension >$null 2>&1
}
if (-not(Test-Extension $extension)) {
Add-Extension $extension >$null 2>&1
}