Merge c3209f468c into 60515b30f8

dbdimp.c

@@ -175,6 +175,20 @@ _sqlite_exec(pTHX_ SV *h, sqlite3 *db, const char *sql)
     return rc;
 }
 
+static void
+_sqlite_log_callback(void *unused, int error_code, const char *message)
+{
+    dTHX;
+
+    SV* drh = get_sv("DBD::SQLite::drh", 0);
+
+    if (drh && SvOK(drh)) {
+        D_imp_drh(drh);
+
+        sqlite_trace(NULL, imp_drh, 3, form("sqlite3_log %d, %s", error_code, message));
+    }
+}
+
 int
 _sqlite_open(pTHX_ SV *dbh, const char *dbname, sqlite3 **db, int flags, int extended)
 {
@@ -430,6 +444,27 @@ sqlite_init(dbistate_t *dbistate)
 {
     dTHX;
     DBISTATE_INIT; /* Initialize the DBI macros  */
+
+#if SQLITE_VERSION_NUMBER >= 3006023
+    /*
+     * "The sqlite3_config() interface may only be
+     * invoked prior to library initialization using
+     * sqlite3_initialize() or after shutdown by
+     * sqlite3_shutdown()."
+     * -- https://sqlite.org/c3ref/config.html
+     */
+    sqlite3_config(SQLITE_CONFIG_LOG, _sqlite_log_callback, NULL);
+#endif
+
+    /*
+     * "For maximum portability, it is recommended that
+     * applications always invoke sqlite3_initialize()
+     * directly prior to using any other SQLite interface.
+     * Future releases of SQLite may require this."
+     * -- https://sqlite.org/c3ref/initialize.html
+     */
+    sqlite3_initialize();
+
 }
 
 int

t/68_sqlite3_log.t

@@ -0,0 +1,23 @@
+use strict;
+use warnings;
+use lib "t/lib";
+use SQLiteTest qw/connect_ok requires_sqlite/;
+use Test::More;
+use if -d ".git", "Test::FailWarnings";
+
+BEGIN { requires_sqlite('3.6.23') }
+
+open my $trace_fh, '>', \my $trace_string;
+
+DBI->trace(3, $trace_fh);
+
+my $dbh = connect_ok(PrintError => 0, RaiseError => 1);
+
+eval {
+    $dbh->selectrow_array(q{ SELECT FROM FROM });
+};
+
+like $trace_string, qr/sqlite3_log/,
+    'sqlite3_log messages forwarded to DBI tracing mechanism';
+
+done_testing;