From 07426780a1c86689127666200e8fc265113d6cd4 Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sat, 2 Jan 2021 17:19:37 -0500 Subject: [PATCH 01/14] Add MSSQL setup to Azure Pipelines build --- azure/apt.yml | 1 + azure/configure.yml | 1 + azure/setup.yml | 2 ++ azure/test.yml | 3 +++ 4 files changed, 7 insertions(+) diff --git a/azure/apt.yml b/azure/apt.yml index 8a28e6bcdb7f1..8c21d1c45f52e 100644 --- a/azure/apt.yml +++ b/azure/apt.yml @@ -40,6 +40,7 @@ steps: postgresql-contrib \ snmpd \ snmp-mibs-downloader \ + freetds-dev \ unixodbc-dev \ llvm \ libc-client-dev \ diff --git a/azure/configure.yml b/azure/configure.yml index 3f5f98f596cd2..2f7b28e15d717 100644 --- a/azure/configure.yml +++ b/azure/configure.yml @@ -63,6 +63,7 @@ steps: --with-imap-ssl \ --with-pdo-odbc=unixODBC,/usr \ --with-pdo-firebird \ + --with-pdo-dblib \ --enable-werror \ --with-config-file-path=/etc \ --with-config-file-scan-dir=/etc/php.d diff --git a/azure/setup.yml b/azure/setup.yml index 489df881596fb..193ac435414d0 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -7,6 +7,8 @@ steps: mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" sudo -u postgres psql -c "CREATE DATABASE test;" + docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -d mcr.microsoft.com/mssql/server:2019-CU3-ubuntu-18.04 + docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" displayName: 'Setup' - script: ./azure/setup-slapd.sh displayName: 'Configure slapd' diff --git a/azure/test.yml b/azure/test.yml index 4a1f97b73424b..95fa7b4a09699 100644 --- a/azure/test.yml +++ b/azure/test.yml @@ -9,6 +9,9 @@ steps: export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test" export PDO_MYSQL_TEST_USER=root export PDO_MYSQL_TEST_PASS=root + export PDO_DBLIB_TEST_DSN="dblib:host=127.0.0.1;dbname=master;version=7.0" + export PDO_DBLIB_TEST_USER="pdo_test" + export PDO_DBLIB_TEST_PASS="password" export TEST_PHP_JUNIT=junit.xml export REPORT_EXIT_STATUS=no export SKIP_IO_CAPTURE_TESTS=1 From e124b81f25dbeffd19ee723f7b888473760b545d Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sat, 2 Jan 2021 17:48:16 -0500 Subject: [PATCH 02/14] Try alt. host to work around timeout --- azure/setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/setup.yml b/azure/setup.yml index 193ac435414d0..98be566f8b41b 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -8,7 +8,7 @@ steps: sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" sudo -u postgres psql -c "CREATE DATABASE test;" docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -d mcr.microsoft.com/mssql/server:2019-CU3-ubuntu-18.04 - docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" + docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" displayName: 'Setup' - script: ./azure/setup-slapd.sh displayName: 'Configure slapd' From b0dbe5a4918e4ebde91c159ce87fa322ee9b8910 Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sat, 2 Jan 2021 18:07:56 -0500 Subject: [PATCH 03/14] Add host param, newer image --- azure/setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/setup.yml b/azure/setup.yml index 98be566f8b41b..6192abec82713 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -7,7 +7,7 @@ steps: mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" sudo -u postgres psql -c "CREATE DATABASE test;" - docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -d mcr.microsoft.com/mssql/server:2019-CU3-ubuntu-18.04 + docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04 docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" displayName: 'Setup' - script: ./azure/setup-slapd.sh From ceaf5dc9c262c65c4e955fed68039a872a461a8a Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sat, 2 Jan 2021 18:19:23 -0500 Subject: [PATCH 04/14] Give host time to come up --- azure/setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/setup.yml b/azure/setup.yml index 6192abec82713..ba45413744a4b 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -8,7 +8,7 @@ steps: sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" sudo -u postgres psql -c "CREATE DATABASE test;" docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04 - docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" + sleep 5 && docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" displayName: 'Setup' - script: ./azure/setup-slapd.sh displayName: 'Configure slapd' From 20f82acd5420197a690d66b6e14651a9cf6a0f64 Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sun, 3 Jan 2021 11:18:19 -0500 Subject: [PATCH 05/14] Extend timeout --- azure/setup.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azure/setup.yml b/azure/setup.yml index ba45413744a4b..adbbe0a36d42c 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -8,7 +8,9 @@ steps: sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" sudo -u postgres psql -c "CREATE DATABASE test;" docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04 - sleep 5 && docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" + # create new account since SA account can't be used for unit tests + # sleep is necessary to give host time to come up, otherwise timeout is likely + sleep 10 && docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" displayName: 'Setup' - script: ./azure/setup-slapd.sh displayName: 'Configure slapd' From 043f861c6382717d2b1e1e63fa139059ec741e21 Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sun, 3 Jan 2021 11:59:47 -0500 Subject: [PATCH 06/14] Fix tests --- ext/pdo/tests/bug_73234.phpt | 11 ++++++++++- ext/pdo_dblib/tests/bug_45876.phpt | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ext/pdo/tests/bug_73234.phpt b/ext/pdo/tests/bug_73234.phpt index 7e708d7424ee9..dddf5c5bf02db 100644 --- a/ext/pdo/tests/bug_73234.phpt +++ b/ext/pdo/tests/bug_73234.phpt @@ -15,7 +15,16 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); $db->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); -$db->exec('CREATE TABLE test(id INT)'); + +switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) { + case 'dblib': + $sql = 'CREATE TABLE test(id INT NULL)'; + break; + default: + $sql = 'CREATE TABLE test(id INT)'; + break; +} +$db->exec($sql); $stmt = $db->prepare('INSERT INTO test VALUES(:value)'); diff --git a/ext/pdo_dblib/tests/bug_45876.phpt b/ext/pdo_dblib/tests/bug_45876.phpt index 7328cdc9bbc2e..fb5359f1ee0e4 100644 --- a/ext/pdo_dblib/tests/bug_45876.phpt +++ b/ext/pdo_dblib/tests/bug_45876.phpt @@ -31,7 +31,7 @@ array(10) { ["native_usertype_id"]=> int(%d) ["pdo_type"]=> - int(2) + int(3) ["name"]=> string(13) "TABLE_CATALOG" ["len"]=> From 52c1a2ba4fce4b4e9d49ed781f80a574df6e90c1 Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sun, 3 Jan 2021 12:42:35 -0500 Subject: [PATCH 07/14] Fix tests --- ext/pdo_dblib/tests/pdo_dblib_param_str_natl.phpt | 2 +- ext/pdo_dblib/tests/types.phpt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/pdo_dblib/tests/pdo_dblib_param_str_natl.phpt b/ext/pdo_dblib/tests/pdo_dblib_param_str_natl.phpt index 8e4062e3593ce..3c5e721a11452 100644 --- a/ext/pdo_dblib/tests/pdo_dblib_param_str_natl.phpt +++ b/ext/pdo_dblib/tests/pdo_dblib_param_str_natl.phpt @@ -23,5 +23,5 @@ Key: Name: [6] :value paramno=-1 name=[6] ":value" is_param=1 -param_type=1073741826 +param_type=1073741827 NULL diff --git a/ext/pdo_dblib/tests/types.phpt b/ext/pdo_dblib/tests/types.phpt index fa336d9fb4497..b1907634b132d 100644 --- a/ext/pdo_dblib/tests/types.phpt +++ b/ext/pdo_dblib/tests/types.phpt @@ -77,6 +77,6 @@ string(19) "2030-01-01 23:59:59" string(1) "0" bool(true) string(4) "1000" -string(5) "10.50" +string(5) "10.5000" string(19) "1950-01-18 23:00:00" string(1) "1" From 9f4a232d3506caf7270ec7195dc31f02214bafff Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sun, 3 Jan 2021 12:42:54 -0500 Subject: [PATCH 08/14] Use timeout instead of sleep --- azure/setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/setup.yml b/azure/setup.yml index adbbe0a36d42c..dbf5f741fc8c8 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -9,8 +9,8 @@ steps: sudo -u postgres psql -c "CREATE DATABASE test;" docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04 # create new account since SA account can't be used for unit tests - # sleep is necessary to give host time to come up, otherwise timeout is likely - sleep 10 && docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" + # extended timeout is necessary to give host time to come up + docker exec sql1 /opt/mssql-tools/bin/sqlcmd -l 120 -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" displayName: 'Setup' - script: ./azure/setup-slapd.sh displayName: 'Configure slapd' From 7c81528f8971bee1d832d0939cfdfcf0985418a8 Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sun, 3 Jan 2021 16:09:00 -0500 Subject: [PATCH 09/14] Infinite timeout --- azure/setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/setup.yml b/azure/setup.yml index dbf5f741fc8c8..735ed20e452d5 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -9,8 +9,8 @@ steps: sudo -u postgres psql -c "CREATE DATABASE test;" docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04 # create new account since SA account can't be used for unit tests - # extended timeout is necessary to give host time to come up - docker exec sql1 /opt/mssql-tools/bin/sqlcmd -l 120 -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" + # use infinite timeout to give host time to come up + docker exec sql1 /opt/mssql-tools/bin/sqlcmd -l 0 -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" displayName: 'Setup' - script: ./azure/setup-slapd.sh displayName: 'Configure slapd' From 49260af5d693b58140a2486a1efebefc0e2c6617 Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sun, 3 Jan 2021 17:03:05 -0500 Subject: [PATCH 10/14] Timeout param unreliable, go back to sleeping instead --- azure/setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure/setup.yml b/azure/setup.yml index 735ed20e452d5..26f5d00e4ca5d 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -9,8 +9,8 @@ steps: sudo -u postgres psql -c "CREATE DATABASE test;" docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04 # create new account since SA account can't be used for unit tests - # use infinite timeout to give host time to come up - docker exec sql1 /opt/mssql-tools/bin/sqlcmd -l 0 -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" + # extended timeout is necessary to give host time to come up + sleep 20 && docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" displayName: 'Setup' - script: ./azure/setup-slapd.sh displayName: 'Configure slapd' From 247bb962872b72a29f2a447babfc69aad78cc6ff Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sun, 3 Jan 2021 17:16:04 -0500 Subject: [PATCH 11/14] Max timeout --- azure/setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure/setup.yml b/azure/setup.yml index 26f5d00e4ca5d..6633350651a66 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -10,7 +10,7 @@ steps: docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04 # create new account since SA account can't be used for unit tests # extended timeout is necessary to give host time to come up - sleep 20 && docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" + docker exec sql1 /opt/mssql-tools/bin/sqlcmd -l 65534 -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" displayName: 'Setup' - script: ./azure/setup-slapd.sh displayName: 'Configure slapd' From 3994890e156e172530f8c5444bddaeac34975676 Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sat, 9 Jan 2021 21:48:01 -0500 Subject: [PATCH 12/14] Start container before doing anything else, maybe will solve timeout --- azure/coverage_job.yml | 1 + azure/file_cache_job.yml | 1 + azure/job.yml | 1 + azure/mssql.yml | 3 +++ azure/setup.yml | 5 +---- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 azure/mssql.yml diff --git a/azure/coverage_job.yml b/azure/coverage_job.yml index 184ebcfafa779..2b8ff10efc2d4 100644 --- a/azure/coverage_job.yml +++ b/azure/coverage_job.yml @@ -10,6 +10,7 @@ jobs: pool: vmImage: 'ubuntu-18.04' steps: + - template: mssql.yml - template: apt.yml - script: | sudo -H pip install gcovr diff --git a/azure/file_cache_job.yml b/azure/file_cache_job.yml index 7c8b392a66bd8..1c5fda3f805fa 100644 --- a/azure/file_cache_job.yml +++ b/azure/file_cache_job.yml @@ -10,6 +10,7 @@ jobs: pool: vmImage: 'ubuntu-18.04' steps: + - template: mssql.yml - template: apt.yml - template: configure.yml parameters: diff --git a/azure/job.yml b/azure/job.yml index f85744eede656..f354c4d717504 100644 --- a/azure/job.yml +++ b/azure/job.yml @@ -10,6 +10,7 @@ jobs: pool: vmImage: 'ubuntu-20.04' steps: + - template: mssql.yml - template: apt.yml - template: configure.yml parameters: diff --git a/azure/mssql.yml b/azure/mssql.yml new file mode 100644 index 0000000000000..5fcbfd695c9e5 --- /dev/null +++ b/azure/mssql.yml @@ -0,0 +1,3 @@ +steps: + - script: docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04 + displayName: 'Start MSSQL container' diff --git a/azure/setup.yml b/azure/setup.yml index 6633350651a66..21fccd415b5b4 100644 --- a/azure/setup.yml +++ b/azure/setup.yml @@ -7,10 +7,7 @@ steps: mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test" sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" sudo -u postgres psql -c "CREATE DATABASE test;" - docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04 - # create new account since SA account can't be used for unit tests - # extended timeout is necessary to give host time to come up - docker exec sql1 /opt/mssql-tools/bin/sqlcmd -l 65534 -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" + docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" displayName: 'Setup' - script: ./azure/setup-slapd.sh displayName: 'Configure slapd' From 715cc132da071419dd3f7bab976bbe47cba5cc4c Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sat, 9 Jan 2021 22:01:19 -0500 Subject: [PATCH 13/14] Docs --- azure/mssql.yml | 2 ++ ext/pdo_dblib/tests/README.md | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 ext/pdo_dblib/tests/README.md diff --git a/azure/mssql.yml b/azure/mssql.yml index 5fcbfd695c9e5..09b2af9617e65 100644 --- a/azure/mssql.yml +++ b/azure/mssql.yml @@ -1,3 +1,5 @@ +# this template should be included close to the beginning, before setup.yml +# the container needs time to come up or the sqlcmd operation in setup.yml will have a login timeout steps: - script: docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04 displayName: 'Start MSSQL container' diff --git a/ext/pdo_dblib/tests/README.md b/ext/pdo_dblib/tests/README.md new file mode 100644 index 0000000000000..3b597d6f57881 --- /dev/null +++ b/ext/pdo_dblib/tests/README.md @@ -0,0 +1,11 @@ +# The pdo_mysql extension tests + +This extension can be tested using Microsoft's Docker image for [SQL Server on Linux](https://hub.docker.com/_/microsoft-mssql-server): + +```bash +docker run -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-latest +docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;" + +# and then from the root of php-src +PDO_DBLIB_TEST_DSN="dblib:host=127.0.0.1;dbname=master;version=7.0" PDO_DBLIB_TEST_USER="pdo_test" PDO_DBLIB_TEST_PASS="password" TESTS=ext/pdo_dblib make test +``` From 758de59ee929ca34068345e299071d03f6c4c355 Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Sat, 9 Jan 2021 22:16:40 -0500 Subject: [PATCH 14/14] Fix test --- ext/pdo_dblib/tests/types.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/pdo_dblib/tests/types.phpt b/ext/pdo_dblib/tests/types.phpt index b1907634b132d..fb32abd34077b 100644 --- a/ext/pdo_dblib/tests/types.phpt +++ b/ext/pdo_dblib/tests/types.phpt @@ -77,6 +77,6 @@ string(19) "2030-01-01 23:59:59" string(1) "0" bool(true) string(4) "1000" -string(5) "10.5000" +string(7) "10.5000" string(19) "1950-01-18 23:00:00" string(1) "1"