diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index 8cd6095078c37..45511639290a7 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -15,20 +15,26 @@ if test "$PHP_PDO_SQLITE" != "no"; then PHP_SETUP_SQLITE([PDO_SQLITE_SHARED_LIBADD]) PHP_CHECK_LIBRARY([sqlite3], [sqlite3_close_v2], - [AC_DEFINE([HAVE_SQLITE3_CLOSE_V2], [1], [have sqlite3_close_v2])], + [AC_DEFINE([HAVE_SQLITE3_CLOSE_V2], [1], + [Define to 1 if SQLite library has the 'sqlite3_close_v2' function.])], [], [$PDO_SQLITE_SHARED_LIBADD]) PHP_CHECK_LIBRARY([sqlite3], [sqlite3_column_table_name], [AC_DEFINE([HAVE_SQLITE3_COLUMN_TABLE_NAME], [1], - [have sqlite3_column_table_name])], + [Define to 1 if SQLite library was compiled with the + SQLITE_ENABLE_COLUMN_METADATA and has the 'sqlite3_column_table_name' + function.])], [], [$PDO_SQLITE_SHARED_LIBADD]) PHP_CHECK_LIBRARY([sqlite3], [sqlite3_load_extension], [], [AC_DEFINE([PDO_SQLITE_OMIT_LOAD_EXTENSION], [1], - [have sqlite3 with extension support])], + [Define to 1 if SQLite library was compiled with the + SQLITE_OMIT_LOAD_EXTENSION and does not have the extension support with + the 'sqlite3_load_extension' function. For usage in the pdo_sqlite. See + https://www.sqlite.org/compile.html.])], [$PDO_SQLITE_SHARED_LIBADD]) PHP_SUBST([PDO_SQLITE_SHARED_LIBADD]) diff --git a/ext/pdo_sqlite/config.w32 b/ext/pdo_sqlite/config.w32 index 59496f4ca52b6..d1f94438925da 100644 --- a/ext/pdo_sqlite/config.w32 +++ b/ext/pdo_sqlite/config.w32 @@ -7,8 +7,8 @@ if (PHP_PDO_SQLITE != "no") { EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c sqlite_statement.c sqlite_sql_parser.c"); ADD_EXTENSION_DEP('pdo_sqlite', 'pdo'); - AC_DEFINE("HAVE_SQLITE3_COLUMN_TABLE_NAME", 1, "have sqlite3_column_table_name"); - AC_DEFINE("HAVE_SQLITE3_CLOSE_V2", 1, "have sqlite3_close_v2"); + AC_DEFINE("HAVE_SQLITE3_COLUMN_TABLE_NAME", 1, "Define to 1 if SQLite library was compiled with the SQLITE_ENABLE_COLUMN_METADATA and has the 'sqlite3_column_table_name' function."); + AC_DEFINE("HAVE_SQLITE3_CLOSE_V2", 1, "Define to 1 if SQLite library has the 'sqlite3_close_v2' function."); ADD_MAKEFILE_FRAGMENT(); } else { WARNING("pdo_sqlite not enabled; libraries and/or headers not found"); diff --git a/ext/pdo_sqlite/pdo_sqlite.stub.php b/ext/pdo_sqlite/pdo_sqlite.stub.php index f705887f316db..e22c8ce10fccc 100644 --- a/ext/pdo_sqlite/pdo_sqlite.stub.php +++ b/ext/pdo_sqlite/pdo_sqlite.stub.php @@ -51,9 +51,6 @@ public function createFunction( int $flags = 0 ): bool {} -// PDO_SQLITE_OMIT_LOAD_EXTENSION might be defined by ext/pdo_sqlite/config.m4 -// if Sqlite3 did not have the sqlite3_load_extension function present -// which can depend on how SQLite was compiled: https://www.sqlite.org/compile.html #ifndef PDO_SQLITE_OMIT_LOAD_EXTENSION public function loadExtension(string $name): void {} #endif diff --git a/ext/pdo_sqlite/pdo_sqlite_arginfo.h b/ext/pdo_sqlite/pdo_sqlite_arginfo.h index 9cb4e25b96591..d0c006ac2d989 100644 --- a/ext/pdo_sqlite/pdo_sqlite_arginfo.h +++ b/ext/pdo_sqlite/pdo_sqlite_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 4b89b32b7fa966fa1c3f481bc2b322f5b8d03129 */ + * Stub hash: 7ceaf5fc8e9c92bf192e824084a706794395ce1a */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Pdo_Sqlite_createAggregate, 0, 3, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) diff --git a/ext/sqlite3/config.w32 b/ext/sqlite3/config.w32 index bca565d5dbbad..f99e4eb281dcc 100644 --- a/ext/sqlite3/config.w32 +++ b/ext/sqlite3/config.w32 @@ -7,8 +7,8 @@ if (PHP_SQLITE3 != "no") { EXTENSION("sqlite3", "sqlite3.c", null, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); AC_DEFINE("HAVE_SQLITE3", 1, "Define to 1 if the PHP extension 'sqlite3' is available."); - AC_DEFINE("HAVE_SQLITE3_ERRSTR", 1, "have sqlite3_errstr function"); - AC_DEFINE("HAVE_SQLITE3_EXPANDED_SQL", 1, "have sqlite3_expanded_sql function"); + AC_DEFINE("HAVE_SQLITE3_ERRSTR", 1, "Define to 1 if SQLite library has the 'sqlite3_errstr' function."); + AC_DEFINE("HAVE_SQLITE3_EXPANDED_SQL", 1, "Define to 1 if SQLite library has the 'sqlite3_expanded_sql' function."); } else { WARNING("sqlite3 not enabled; libraries and/or headers not found"); } diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4 index 08af7c1b371e1..453108f692a6d 100644 --- a/ext/sqlite3/config0.m4 +++ b/ext/sqlite3/config0.m4 @@ -10,20 +10,24 @@ if test $PHP_SQLITE3 != "no"; then [Define to 1 if the PHP extension 'sqlite3' is available.]) PHP_CHECK_LIBRARY([sqlite3], [sqlite3_errstr], - [AC_DEFINE([HAVE_SQLITE3_ERRSTR], [1], [have sqlite3_errstr function])], + [AC_DEFINE([HAVE_SQLITE3_ERRSTR], [1], + [Define to 1 if SQLite library has the 'sqlite3_errstr' function.])], [], [$SQLITE3_SHARED_LIBADD]) PHP_CHECK_LIBRARY([sqlite3], [sqlite3_expanded_sql], [AC_DEFINE([HAVE_SQLITE3_EXPANDED_SQL], [1], - [have sqlite3_expanded_sql function])], + [Define to 1 if SQLite library has the 'sqlite3_expanded_sql' function.])], [], [$SQLITE3_SHARED_LIBADD]) PHP_CHECK_LIBRARY([sqlite3], [sqlite3_load_extension], [], [AC_DEFINE([SQLITE_OMIT_LOAD_EXTENSION], [1], - [have sqlite3 with extension support])], + [Define to 1 if SQLite library was compiled with the + SQLITE_OMIT_LOAD_EXTENSION and does not have the extension support with + the 'sqlite3_load_extension' function. For usage in the sqlite3 PHP + extension. See https://www.sqlite.org/compile.html.])], [$SQLITE3_SHARED_LIBADD]) PHP_NEW_EXTENSION([sqlite3],