The sqlite3_trace() callback does not try to expand parameters in statements

that have no parameter.

FossilOrigin-Name: 917e3c36293a1bf052a16116c93e5037ed712f96

diff --git a/manifest b/manifest
index 57c689678efa9753de5ca0ca23e637bf907391b5..f1a2f3bac89e7a920f722afafa2702ae848c8d17 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sincorrect\sassert()\sstatement\sin\sthe\sCREATE\sINDEX\scode\sgenerator.
-D 2015-04-18T17:43:29.222
+C The\ssqlite3_trace()\scallback\sdoes\snot\stry\sto\sexpand\sparameters\sin\sstatements\nthat\shave\sno\sparameter.
+D 2015-04-18T19:20:14.612
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -301,7 +301,7 @@ F src/vdbeaux.c 03591cca98ec50e1493043f0ff7abbece0b9c83d
 F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
 F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
-F src/vdbetrace.c e41a50837d694ddd8434533964058e82f0ee7288
+F src/vdbetrace.c f95c2dff9041fcf07f871789c22ebb0648ea0b7c
 F src/vtab.c be741af2a377bd894104d62504796e7394a04916
 F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9
@@ -1251,7 +1251,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P e98d481d84ef31b6ed154f14deae9b261f722616
-R 56d8c8ddd6b4abbbd3e6fe39eaafa28b
+P 2eed41fda068f2cbac55e63d7c1875ddaa331508
+R fe8a360bbce7dedd87d096d07c896e4c
 U drh
-Z bd5e83def6fd1c67c4a5e49c1b029978
+Z 768a04b82f6060145bfe8edb7197ea08

diff --git a/manifest.uuid b/manifest.uuid
index d89b9a35bd1cec4d1af3082e68dfe8d226d7c336..98458ab03b6ca81fd2e9ca1d8dd638b81e5e9b1d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2eed41fda068f2cbac55e63d7c1875ddaa331508
\ No newline at end of file
+917e3c36293a1bf052a16116c93e5037ed712f96
\ No newline at end of file

diff --git a/src/vdbetrace.c b/src/vdbetrace.c
index aeda6aabb1d656e1ada2f41dcb680bf6b751e121..fe0dfd3f7a1cb932d3cc884a131687f553305a55 100644 (file)
--- a/src/vdbetrace.c
+++ b/src/vdbetrace.c
@@ -95,6 +95,8 @@ char *sqlite3VdbeExpandSql(
       assert( (zRawSql - zStart) > 0 );
       sqlite3StrAccumAppend(&out, zStart, (int)(zRawSql-zStart));
     }
+  }else if( p->nVar==0 ){
+    sqlite3StrAccumAppend(&out, zRawSql, sqlite3Strlen30(zRawSql));
   }else{
     while( zRawSql[0] ){
       n = findNextHostParameter(zRawSql, &nToken);