com php-src: Enable FTS4 and FTS5 for bundled libsqlite: ext/pdo_sqlite/config.m4 ext/pdo_sqlite/config.w3 2 ext/sqlite3/config.w32
ext/sqlite3/config0 .m4

Commit: ef55a4b5b32728ca92f1563698fcd9af5d91ad93 Author: Anatol Belski <ab@php.net> Tue, 8 Nov 2016 02:26:43 +0100 Parents: 0c2156d190289d8332e10dad4ea4b83e2cbcdf21 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ef55a4b5b32728ca92f1563698fcd9af5d91ad93 Log: 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. Changed paths: M ext/pdo_sqlite/config.m4 M ext/pdo_sqlite/config.w32 M ext/sqlite3/config.w32 M ext/sqlite3/config0.m4 Diff: diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index fcbe0b5..44b22b6 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -79,7 +79,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then threadsafe_flags="-DSQLITE_THREADSAFE=0" fi - other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1" + other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1" dnl As long as intl is not shared we can have ICU support if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32 index 4f6a5d4..71ea9ef 100644 --- a/ext/pdo_sqlite/config.w32 +++ b/ext/pdo_sqlite/config.w32 @@ -4,7 +4,7 @@ ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no"); if (PHP_PDO_SQLITE != "no") { - EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c", null, "/DSQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D SQLITE_CORE=1 /I" + configure_module_dirname + "/../sqlite3/libsqlite /I" + configure_module_dirname); + EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c", null, "/DSQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_FTS4=1 /D SQLITE_ENABLE_FTS5=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D SQLITE_CORE=1 /I" + configure_module_dirname + "/../sqlite3/libsqlite /I" + configure_module_dirname); ADD_EXTENSION_DEP('pdo_sqlite', 'pdo'); // If pdo_sqlite is static, and sqlite3 is also static, then we don't add a second copy of the sqlite3 libs diff --git a/ext/sqlite3/config.w32 b/ext/sqlite3/config.w32 index 60dd2fa..29a2832 100644 --- a/ext/sqlite3/config.w32 +++ b/ext/sqlite3/config.w32 @@ -4,7 +4,7 @@ ARG_WITH("sqlite3", "SQLite 3 support", "no"); if (PHP_SQLITE3 != "no") { - ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D SQLITE_CORE=1 /D SQLITE_API=__declspec(dllexport) "); + ADD_FLAG("CFLAGS_SQLITE3", "/D SQLITE_THREADSAFE=" + (PHP_ZTS == "yes" ? "1" : "0") + " /D SQLITE_ENABLE_FTS3=1 /D SQLITE_ENABLE_FTS4=1 /D SQLITE_ENABLE_FTS5=1 /D SQLITE_ENABLE_COLUMN_METADATA=1 /D SQLITE_CORE=1 /D SQLITE_API=__declspec(dllexport) "); EXTENSION("sqlite3", "sqlite3.c", null, "/I" + configure_module_dirname + "/libsqlite /I" + configure_module_dirname + " /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", "sqlite3"); diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4 index bbb1133..3aa4492 100644 --- a/ext/sqlite3/config0.m4 +++ b/ext/sqlite3/config0.m4 @@ -75,7 +75,7 @@ if test $PHP_SQLITE3 != "no"; then debug_flags="-DSQLITE_DEBUG=1" fi - other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1" + other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1" dnl As long as intl is not shared we can have ICU support if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then