diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-06 12:36:55 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-06 12:36:55 +0200 |
| commit | 6083a387a81dbbd66d6316a3a12a63f06d5f7109 (patch) | |
| tree | 4576666b095bba91d6a78afe7f3d8cc67d442b20 /ext/pdo_sqlite/sqlite_statement.c | |
| parent | 61330b0faf5dfbed79cba012744dabce9d20cc8f (diff) | |
| download | php-git-6083a387a81dbbd66d6316a3a12a63f06d5f7109.tar.gz | |
Unbundle libsqlite3
Since there is no need to patch libsqlite3 for our purposes, and since
libsqlite3 ≥ 3.3.9 (which is our current requirement) is widely
available on distros, there is no reason anymore to bundle the library.
Besides removing the bundled libsqlite, and adapting the configuration
respectively, we also fix the use of the SQLITE_ENABLE_COLUMN_METADATA
compile time constant to detect whether sqlite3_column_table_name() is
available by a working feature detection (otherwise bug_42589.phpt
would fail). We also skip bug73068.phpt for libsqlite 3.11.0 to
3.14.1 which have a bug (<https://sqlite.org/src/info/ef360601>).
We also completely drop support for the obscure pdo_sqlite_external
extension (which could have been enabled on Windows only by passing
`--pdo-sqlite-external` to configure), since it is not needed anymore.
Furthermore, we remove references to the bundled libsqlite from
Makefile.gcov, CONTRIBUTING.md and README.REDIST.BINS.
Diffstat (limited to 'ext/pdo_sqlite/sqlite_statement.c')
| -rw-r--r-- | ext/pdo_sqlite/sqlite_statement.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 4a9d2462bf..ff813134c6 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -331,7 +331,7 @@ static int pdo_sqlite_stmt_col_meta(pdo_stmt_t *stmt, zend_long colno, zval *ret add_assoc_string(return_value, "sqlite:decl_type", (char *)str); } -#ifdef SQLITE_ENABLE_COLUMN_METADATA +#ifdef HAVE_SQLITE3_COLUMN_TABLE_NAME str = sqlite3_column_table_name(S->stmt, colno); if (str) { add_assoc_string(return_value, "table", (char *)str); |