Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Revert to Postgres 9.6, AppVeyor seems to have issues with 10
This commit is contained in:
Anatol Belski 2017-12-22 23:39:37 +01:00
commit eb5ba59ad5
2 changed files with 2 additions and 2 deletions

View file

@ -43,7 +43,7 @@ environment:
services:
# the setup scripts have to be touched, once some other db version is used
- mysql
- postgresql10
- postgresql96
platform:
- x64

View file

@ -37,7 +37,7 @@ set PGPASSWORD=Password12!
rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!
echo ^<?php $conn_str = "host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%"; ?^> >> "./ext/pgsql/tests/config.inc"
set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD%
"C:\Program Files\PostgreSQL\10\bin\createdb.exe" test
"C:\Program Files\PostgreSQL\9.6\bin\createdb.exe" test
if %errorlevel% neq 0 exit /b 3
rem prepare for ext/openssl