php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
123,194 Commits 549 Branches 1,485 Tags
d02197853e5c2f01acd0986e2b496f502c4fe462
Commit Graph

601 Commits

Author SHA1 Message Date
Christoph M. Becker e511f152f4 Merge branch 'pull-request/2528' 
* pull-request/2528:
  Change flags to use SQLITE3_OPEN_READ* constants instead of a fake-boolean, add tests on errors
  Implement writing to BLOBs in SQLite3
 2017-06-19 14:47:42 +02:00
Christoph M. Becker 130f06a8a1 Update to SQLite 3.19.3 2017-06-09 14:47:18 +02:00
Christoph M. Becker fb0f3f60d4 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Use reasonable SQLite3 module version
 2017-06-09 14:11:11 +02:00
Christoph M. Becker 1980234fc2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use reasonable SQLite3 module version
 2017-06-09 14:05:04 +02:00
Christoph M. Becker c3b910370c Use reasonable SQLite3 module version 
Since PECL/sqlite3 has been moved to ext/sqlite3 in 2008, the SQLite3
module version is hardcoded to `0.7-dev`. It doesn't appear to make
much sense to have an own module version for a bundled extensions, but
as other code might rely on it, we don't remove the constant but rather
make it an alias of the PHP version.
 2017-06-09 13:49:32 +02:00
BohwaZ 626ee74ee8 Change flags to use SQLITE3_OPEN_READ* constants instead of a fake-boolean, add tests on errors 2017-06-08 11:25:00 +12:00
Christoph M. Becker 455db49c1b Update to SQLite 3.19.2 2017-06-07 14:34:57 +02:00
BohwaZ 208aea1e85 Implement writing to BLOBs in SQLite3 2017-05-18 11:54:55 +12:00
Christoph M. Becker e0f2a70c22 Update to SQLite 3.18.0 2017-04-17 00:44:30 +02:00
Anatol Belski e282c403c5 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix misleading typo in identifiers
 2017-04-11 13:50:56 +02:00
Anatol Belski a334da8b17 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix misleading typo in identifiers
 2017-04-11 13:49:19 +02:00
Anatol Belski 8bba2df2eb Fix misleading typo in identifiers 2017-04-11 13:48:04 +02:00
Joe Watkins f0f8c9cf0a Merge branch 'PHP-7.1' 
* PHP-7.1:
  fixed bug #74413 wrong reflection on SQLite3::enableExceptions
 2017-04-11 12:17:00 +01:00
Joe Watkins 8bbdbd063e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fixed bug #74413 wrong reflection on SQLite3::enableExceptions
 2017-04-11 12:15:24 +01:00
Joe Watkins b74b325aea fixed bug #74413 wrong reflection on SQLite3::enableExceptions 2017-04-11 12:14:25 +01:00
Markus Staab 22881e06e2 fixed typo 2017-03-29 09:10:42 +02:00
Markus Staab 851f3654f1 fixed typo 2017-03-29 09:09:53 +02:00
Remi Collet 83b0708878 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix buid with system libsqlite, see bug #74217
 2017-03-29 07:28:26 +02:00
Remi Collet 012dc336a6 Fix buid with system libsqlite, see bug #74217 
SQLITE_DETERMINISTIC only exists in recent version
e.g. missing on 3.7 which is the default on RHEL/CentOS-7
and probably others (wheezy have 3.7, jessie 3.8...)
 2017-03-29 07:25:01 +02:00
Nikita Popov e31342ef84 Merge branch 'PHP-7.1' 2017-03-12 17:04:02 +01:00
andrewnester fbf0e0587f Implement FR #74217: deterministic sqlite functions 2017-03-12 17:03:00 +01:00
Christoph M. Becker 6bb1fd9032 Update to SQLite 3.17.0 2017-02-14 14:00:54 +01:00
Christoph M. Becker ec6b03a789 Update to SQLite 3.16.2 2017-01-12 00:14:55 +01:00
Sammy Kaye Powers dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers 478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Christoph M. Becker 9574486f0e Update to SQLite 3.16.1 2017-01-04 11:53:13 +01:00
Sammy Kaye Powers 9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Christoph M. Becker 60b4e312ae Merge branch 'PHP-7.1' 
* PHP-7.1:
  Revert "Fix #73530: Unsetting result set may reset other result set"
 2016-12-29 13:58:14 +01:00
Christoph M. Becker f4d884dc6e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Fix #73530: Unsetting result set may reset other result set"
 2016-12-29 13:54:11 +01:00
Christoph M. Becker 88d1a2c5aa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Revert "Fix #73530: Unsetting result set may reset other result set"

# Conflicts:
#	ext/sqlite3/sqlite3.c
 2016-12-29 13:47:28 +01:00
Christoph M. Becker 2ba3b27594 Revert "Fix #73530: Unsetting result set may reset other result set" 
This reverts commit eb570294a2.

That commit caused a regression, so it's probably best to revert it, and
to tackle the issue for the next minor release.
 2016-12-29 12:59:04 +01:00
Christoph M. Becker cf8e258531 Update to SQLite 3.15.2 2016-12-11 19:56:40 +01:00
Nikita Popov 5af586bec5 Remove more PHP 6 leftovers from tests 2016-11-24 22:39:39 +01:00
Nikita Popov 45f7b2bcc8 Fix CRLF line-endings in tests 
Also fix a single instance of CRLF in ibase_query.c.
 2016-11-20 22:31:24 +01:00
Dmitry Stogov bf17a4f09d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed ZTS build
 2016-11-16 16:47:35 +03:00
Dmitry Stogov 1f3a5b4501 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed ZTS build
 2016-11-16 16:47:22 +03:00
Dmitry Stogov 99e5d6c4a5 Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:php-src:
 2016-11-16 16:47:05 +03:00
Christoph M. Becker 07ed7b5198 Merge branch 'PHP-7.1' 2016-11-16 12:08:16 +01:00
Christoph M. Becker c5abb87322 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-16 12:02:29 +01:00
Christoph M. Becker 936cafe33e Merge branch 'PHP-5.6' into PHP-7.0 2016-11-16 12:00:39 +01:00
Christoph M. Becker eb570294a2 Fix #73530: Unsetting result set may reset other result set 
Calling sqlite3_reset() when a result set object is freed can cause
undesired and maybe even hard to track interference with other result
sets. Furthermore, there is no need to call sqlite3_reset(), because
that is implicitly called on SQLite3Stmt::execute(), and users are
encouraged to explicitly call either SQLite3Result::finalize() or
SQLite3Stmt::reset() anyway.
 2016-11-16 11:49:04 +01:00
Christoph M. Becker 531eedf38f Merge branch 'PHP-7.1' 2016-11-14 16:09:40 +01:00
Christoph M. Becker d6c36e9af7 Update to SQLite 3.15.1 2016-11-14 14:55:13 +01:00
Anatol Belski 47d044b1ad Merge branch 'PHP-7.1' 
* PHP-7.1:
  Enable FTS4 and FTS5 for bundled libsqlite
 2016-11-08 02:36:05 +01:00
Anatol Belski ed12167edf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Enable FTS4 and FTS5 for bundled libsqlite
 2016-11-08 02:35:33 +01:00
Anatol Belski ef55a4b5b3 Enable FTS4 and FTS5 for bundled libsqlite 
FTS3 is already enabled by default, and the other FTS versions
seems just to have been missed. Given that, the other FTS plugins
look like a low impact so worth a try. The current bundled libsqlite
versions in 7.x are proven stable already and support FTS5.
 2016-11-08 02:26:43 +01:00
Kalle Sommer Nielsen f38834a180 Fix compiler warnings, always cast to zend_long from sqlite3_int64 when converting to a zval 2016-10-20 10:57:38 +02:00
Kalle Sommer Nielsen 6ca38e8cf8 Ignore the return value of sqlite3->busyTimeout() if their "API Armor" is not enabled. 
The sqlite3_busy_timeout() function can only ever return SQLITE_OK if the armor is not compiled in, which means we can skip this error check
 2016-10-20 10:56:08 +02:00
Christoph M. Becker e147eeb4bc Merge branch 'PHP-7.1' 2016-10-18 00:02:18 +02:00
Christoph M. Becker 32123167d1 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-18 00:01:32 +02:00