sqlsrv and pdo_sqlsrv; use Microsoft ODBC 18 when available, support Debian Bullseye (#512)

pull/518/head
Michele Locati 2022-02-16 17:31:14 +01:00 committed by GitHub
parent 81adf2b14f
commit 1be3c17e78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions

View File

@ -1,6 +1,6 @@
parallel zts parallel zts
pdo_sqlsrv !alpine3.7 !alpine3.8 !bullseye pdo_sqlsrv !alpine3.7 !alpine3.8 !7.3-bullseye
pthreads zts pthreads zts
sqlsrv !alpine3.7 !alpine3.8 !7.1-alpine3.9 !7.1-alpine3.10 !bullseye sqlsrv !alpine3.7 !alpine3.8 !7.1-alpine3.9 !7.1-alpine3.10 !7.3-bullseye
tensor !alpine3.15 tensor !alpine3.15
vips !alpine3.7 !alpine3.8 !alpine3.9 !jessie vips !alpine3.7 !alpine3.8 !alpine3.9 !jessie

View File

@ -1492,7 +1492,11 @@ installMicrosoftSqlServerODBC() {
alpine) alpine)
# https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server#alpine17 # https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server#alpine17
rm -rf /tmp/src/msodbcsql.apk rm -rf /tmp/src/msodbcsql.apk
curl -sSLf -o /tmp/src/msodbcsql.apk https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.8.1.1-1_amd64.apk if test $PHP_MAJMIN_VERSION -le 703; then
curl -sSLf -o /tmp/src/msodbcsql.apk https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.8.1.1-1_amd64.apk
else
curl -sSLf -o /tmp/src/msodbcsql.apk https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/msodbcsql18_18.0.1.1-1_amd64.apk
fi
printf '\n' | apk add --allow-untrusted /tmp/src/msodbcsql.apk printf '\n' | apk add --allow-untrusted /tmp/src/msodbcsql.apk
rm -rf /tmp/src/msodbcsql.apk rm -rf /tmp/src/msodbcsql.apk
;; ;;
@ -1511,7 +1515,14 @@ installMicrosoftSqlServerODBC() {
DEBIAN_FRONTEND=noninteractive apt-get -q update DEBIAN_FRONTEND=noninteractive apt-get -q update
fi fi
printf -- '- installing the APT package\n' printf -- '- installing the APT package\n'
DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -qy --no-install-recommends install '^msodbcsql[0-9]+$' if test $PHP_MAJMIN_VERSION -le 703; then
DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -qy --no-install-recommends install msodbcsql17
elif test $DISTRO_VERSION_NUMBER -ge 9 && $DISTRO_VERSION_NUMBER -le 10; then
# On Debian 9 and 10 we have both msodbcsql17 and msodbcsql18: let's install just one
DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -qy --no-install-recommends install msodbcsql18
else
DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -qy --no-install-recommends install '^msodbcsql[0-9]+$'
fi
;; ;;
esac esac
} }