Add the sqlite_trace() hook for tracing the SQL that an application executes.

The plan is to leave this API undocumented for the time being, in case we
want to make changes to it later. (CVS 836)

FossilOrigin-Name: f67bff8ff3db9694f87daf1a549d24ea9612da6b

diff --git a/VERSION b/VERSION
index a603bb50a29e354cfdf452850141fcb013b0a71a..69af21c1a38f3cc474ae472424e633eb40492192 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.7.5
+2.7.6-beta1

diff --git a/manifest b/manifest
index b64d35e9e81c07abdc024896e096bb576f8640cd..dcc4750673475f804f87fb8fdbac21d7b0dda0be 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Improvements\sto\sthe\spager\sto\shelp\slarge\supdates\sagainst\sa\slarge\sdatabase\srun\nfaster.\s\sAlso\simproved\sthe\stesting\sof\sthe\spager\srollback\salgorithms.\s(CVS\s835)
-D 2003-01-16T13:42:43
+C Add\sthe\ssqlite_trace()\shook\sfor\stracing\sthe\sSQL\sthat\san\sapplication\sexecutes.\r\nThe\splan\sis\sto\sleave\sthis\sAPI\sundocumented\sfor\sthe\stime\sbeing,\sin\scase\swe\r\nwant\sto\smake\schanges\sto\sit\slater.\s(CVS\s836)
+D 2003-01-16T16:28:54
 F Makefile.in 6606854b1512f185b8e8c779b8d7fc2750463d64
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
-F VERSION 0b1d326c46b00250dfbd9b1a55dc0f4b7d74febc
+F VERSION cb5dfb005f1dfad89748ecd8dd06a6a31de4d01f
 F aclocal.m4 11faa843caa38fd451bc6aeb43e248d1723a269d
 F config.guess f38b1e93d1e0fa6f5a6913e9e7b12774b9232588
 F config.sub f14b07d544ca26b5d698259045136b783e18fc7f
@@ -29,7 +29,7 @@ F src/func.c 90c583f0b91220f7cd411a2407deaf9327245d63
 F src/hash.c 4fc39feb7b7711f6495ee9f2159559bedb043e1f
 F src/hash.h cd0433998bc1a3759d244e1637fe5a3c13b53bf8
 F src/insert.c db954e955970795819145a3649fd2ad116a58890
-F src/main.c c8f8fdfe4548a8404fab90ff6ad374b217e6b7fa
+F src/main.c 2747a82e1facdf81658cc9d42bb6805c0371037d
 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
 F src/os.c 3a652608c296cf639ce63bd31d255db862e45685
 F src/os.h afa3e096213bad86845f8bdca81a9e917505e401
@@ -41,8 +41,8 @@ F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
 F src/select.c 5ce75c1381d8ec3b89ea4d7eb5171bc57785e610
 F src/shell.c c9946847b81b8b7f32ad195498dafbc623c6874f
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
-F src/sqlite.h.in 7907095c144091a611faef89d771bc0ee4e3ab9d
-F src/sqliteInt.h bc986d4fc3d8285cec370eb5e305d5499f422a31
+F src/sqlite.h.in 90657185cff387069d17c5b876a87a6a7a3b6f10
+F src/sqliteInt.h 1df32c9bcf08e30b5b8b978fd587fac018273c33
 F src/table.c eed2098c9b577aa17f8abe89313a9c4413f57d63
 F src/tclsqlite.c 9f2c00a92338c51171ded8943bd42d77f7e69e64
 F src/test1.c 921e5dda494f836d2ebea703bd5b239a7cc963d0
@@ -154,7 +154,7 @@ F www/speed.tcl a20a792738475b68756ea7a19321600f23d1d803
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 701a73918db22fd134a8b959670ba7a4a908c8c5
-R 542f195ac0271d966b46ad74cdefd9a5
+P 717523d3750dce784fa767ed9a8267d1246798ef
+R fb11885bef68ba2ec34b18f0b356376e
 U drh
-Z 7a6aa3269b75773568aa62b73bab365a
+Z 4d889a4206e53c677a4ddbc963157d53

diff --git a/manifest.uuid b/manifest.uuid
index 7353855cab33f442e6cc8d30c2dfb5084568635b..347f282c706c5a8525c81a410ebba8f6cb832d9b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-717523d3750dce784fa767ed9a8267d1246798ef
\ No newline at end of file
+f67bff8ff3db9694f87daf1a549d24ea9612da6b
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 2c602103a1d90c27b4a590e17b40b460af6f963c..0985c880500db34c3c1f5fc60b1254917808344b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.106 2003/01/12 18:02:18 drh Exp $
+** $Id: main.c,v 1.107 2003/01/16 16:28:54 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -602,6 +602,9 @@ int sqlite_exec(
 ){
   Parse sParse;
 
+#ifndef SQLITE_OMIT_TRACE
+  if( db->xTrace ) db->xTrace(db->pTraceArg, zSql);
+#endif
   if( pzErrMsg ) *pzErrMsg = 0;
   if( sqliteSafetyOn(db) ) goto exec_misuse;
   if( (db->flags & SQLITE_Initialized)==0 ){
@@ -858,6 +861,26 @@ int sqlite_function_type(sqlite *db, const char *zName, int dataType){
   return SQLITE_OK;
 }
 
+/*
+** Register a trace function.  The pArg from the previously registered trace
+** is returned.  
+**
+** A NULL trace function means that no tracing is executes.  A non-NULL
+** trace is a pointer to a function that is invoked at the start of each
+** sqlite_exec().
+*/
+void *sqlite_trace(sqlite *db, void (*xTrace)(void*,const char*), void *pArg){
+#ifndef SQLITE_OMIT_TRACE
+  void *pOld = db->pTraceArg;
+  db->xTrace = xTrace;
+  db->pTraceArg = pArg;
+  return pOld;
+#else
+  return 0;
+#endif
+}
+
+
 /*
 ** Attempt to open the file named in the argument as the auxiliary database
 ** file.  The auxiliary database file is used to store TEMP tables.  But

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 410691b437c2784dbaba10a81fe6c6f7f9779584..0f5dde875fb01dd5d70e0e6d0a65036abd09c37c 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -12,7 +12,7 @@
 ** This header file defines the interface that the SQLite library
 ** presents to client programs.
 **
-** @(#) $Id: sqlite.h.in,v 1.38 2003/01/14 02:49:28 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.39 2003/01/16 16:28:54 drh Exp $
 */
 #ifndef _SQLITE_H_
 #define _SQLITE_H_
@@ -554,6 +554,13 @@ int sqlite_set_authorizer(
 #define SQLITE_DENY   1   /* Abort the SQL statement with an error */
 #define SQLITE_IGNORE 2   /* Don't allow access, but don't generate an error */
 
+/*
+** Register a function that is called at every invocation of sqlite_exec().
+** This function can be used (for example) to generate a log file of all
+** SQL executed against a database.
+*/
+void *sqlite_trace(sqlite*, void(*xTrace)(void*,const char*), void*);
+
 /*
 ** Attempt to open the file named in the argument as the auxiliary database
 ** file.  The auxiliary database file is used to store TEMP tables.  But

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 38ae75c05af0610d78d0e5f04a79a6055445d8fb..bec619c66a090b96e20cec157e9d46140f96c58b 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.154 2003/01/13 23:27:33 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.155 2003/01/16 16:28:54 drh Exp $
 */
 #include "config.h"
 #include "sqlite.h"
@@ -225,6 +225,10 @@ struct sqlite {
   int magic;                    /* Magic number for detect library misuse */
   int nChange;                  /* Number of rows changed */
   int recursionDepth;           /* Number of nested calls to sqlite_exec() */
+#ifndef SQLITE_OMIT_TRACE
+  void (*xTrace)(void*,const char*);     /* Trace function */
+  void *pTraceArg;                       /* Argument to the trace function */
+#endif
 #ifndef SQLITE_OMIT_AUTHORIZATION
   int (*xAuth)(void*,int,const char*,const char*); /* Access Auth function */
   void *pAuthArg;               /* 1st argument to the access auth function */