archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  Fix buid with system libsqlite, see bug #74217
This commit is contained in:
Remi Collet 2017-03-29 07:28:26 +02:00
commit 83b0708878
4 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/pdo_sqlite/pdo_sqlite.c
View file

@ -69,7 +69,9 @@ ZEND_GET_MODULE(pdo_sqlite)
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(pdo_sqlite)
{
#ifdef SQLITE_DETERMINISTIC
REGISTER_PDO_CLASS_CONST_LONG("SQLITE_DETERMINISTIC", (zend_long)SQLITE_DETERMINISTIC);
#endif
return php_pdo_register_driver(&pdo_sqlite_driver);
}

5
ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt
View file

@ -1,7 +1,10 @@
--TEST--
PDO_sqlite: Testing sqliteCreateFunction() with flags
--SKIPIF--
<?php if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?>
<?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
if (!defined('PDO::SQLITE_DETERMINISTIC')) die('skip system sqlite is to old');
?>
--FILE--
<?php

2
ext/sqlite3/sqlite3.c
View file

@ -2289,7 +2289,9 @@ PHP_MINIT_FUNCTION(sqlite3)
REGISTER_LONG_CONSTANT("SQLITE3_OPEN_READWRITE", SQLITE_OPEN_READWRITE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("SQLITE3_OPEN_CREATE", SQLITE_OPEN_CREATE, CONST_CS | CONST_PERSISTENT);
#ifdef SQLITE_DETERMINISTIC
REGISTER_LONG_CONSTANT("SQLITE3_DETERMINISTIC", SQLITE_DETERMINISTIC, CONST_CS | CONST_PERSISTENT);
#endif
return SUCCESS;
}

5
ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt
View file

@ -1,7 +1,10 @@
--TEST--
SQLite3::createFunction - Test with flags
--SKIPIF--
<?php require_once(__DIR__ . '/skipif.inc'); ?>
<?php
require_once(__DIR__ . '/skipif.inc');
if (!defined('SQLITE3_DETERMINISTIC')) die('skip system sqlite is to old');
?>
--FILE--
<?php