database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Enhance the selecttrace display by showing Select.selFlags.

Browse Source 
FossilOrigin-Name: 45d3893c6142ee1dfed48e26a13cf547da12468a
This commit is contained in:
drh
2015-05-19 23:56:07 +00:00
parent 7ac07bda73
commit 7f0cd09cdd
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sthe\sMSVC\smakefile\sso\sthat\sit\sworks\swith\sOTA.\s\sFix\sa\sharmless\scompiler\nwarning\sin\sFTS3. C Enhance\sthe\sselecttrace\sdisplay\sby\sshowing\sSelect.selFlags.
D 2015-05-19T22:56:45.390 D 2015-05-19T23:56:07.009
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7 F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -250,7 +250,7 @@ F src/printf.c 13ce37e5574f9b0682fa86dbcf9faf76b9d82a15
F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28 F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
F src/select.c 6d9d6ae899acb9bf148862e8cccdf16085514b26 F src/select.c 95e728e1bdbca2ee45016308e3eb6d19095155cc
F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
F src/sqlite.h.in 0127e418883c2b41f7fbc056bc1033fa56fbd2a5 F src/sqlite.h.in 0127e418883c2b41f7fbc056bc1033fa56fbd2a5
F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
@@ -1278,7 +1278,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P b271ed56532a78323accc8a7cb348d55f95c350e P c7b16645307d6e46c4153693d6806269de64955f
R 90be3dacb0448d45e67c9b3d977b8761 R ea3eb1f6139bdf0dd5e3dd418a160ce1
U drh U drh
Z 153c06778c9f21378fccc520e3f4d229 Z 134fe99ba84c8d22f546034f7884244d

2
manifest.uuid
View File

@@ -1 +1 @@
c7b16645307d6e46c4153693d6806269de64955f 45d3893c6142ee1dfed48e26a13cf547da12468a

4
src/select.c
View File

@@ -5523,9 +5523,9 @@ select_end:
void sqlite3TreeViewSelect(TreeView *pView, const Select *p, u8 moreToFollow){ void sqlite3TreeViewSelect(TreeView *pView, const Select *p, u8 moreToFollow){
int n = 0; int n = 0;
pView = sqlite3TreeViewPush(pView, moreToFollow); pView = sqlite3TreeViewPush(pView, moreToFollow);
sqlite3TreeViewLine(pView, "SELECT%s%s (0x%p)", sqlite3TreeViewLine(pView, "SELECT%s%s (0x%p) selFlags=0x%x",
((p->selFlags & SF_Distinct) ? " DISTINCT" : ""), ((p->selFlags & SF_Distinct) ? " DISTINCT" : ""),
((p->selFlags & SF_Aggregate) ? " agg_flag" : ""), p ((p->selFlags & SF_Aggregate) ? " agg_flag" : ""), p, p->selFlags
); );
if( p->pSrc && p->pSrc->nSrc ) n++; if( p->pSrc && p->pSrc->nSrc ) n++;
if( p->pWhere ) n++; if( p->pWhere ) n++;