Fossil SCM

Disable several warnings about sorting w/o an index.

drh 2011-06-14 22:31 trunk
Commit b893eb0dad8744c13b24de4e22736a5026b93075
Parent 3a610a3980eb098…
2 files changed +3 -3 +1 -1
~ src/info.c ~ src/timeline.c
M src/info.c
+3 -3
--- src/info.c
+++ src/info.c
@@ -190,11 +190,11 @@
190190
 " (SELECT uuid FROM blob WHERE rid=tagxref.srcid AND rid!=%d),"
191191
 " value, datetime(tagxref.mtime,'localtime'), tagtype,"
192192
 " (SELECT uuid FROM blob WHERE rid=tagxref.origid AND rid!=%d)"
193193
 " FROM tagxref JOIN tag ON tagxref.tagid=tag.tagid"
194194
 " WHERE tagxref.rid=%d AND tagname NOT GLOB '%s'"
195
- " ORDER BY tagname", rid, rid, rid, zNotGlob
195
+ " ORDER BY tagname /*sort*/", rid, rid, rid, zNotGlob
196196
 );
197197
 while( db_step(&q)==SQLITE_ROW ){
198198
 const char *zTagname = db_column_text(&q, 1);
199199
 const char *zSrcUuid = db_column_text(&q, 2);
200200
 const char *zValue = db_column_text(&q, 3);
@@ -525,11 +525,11 @@
525525
 " (SELECT uuid FROM blob WHERE rid=mlink.pid),"
526526
 " (SELECT uuid FROM blob WHERE rid=mlink.fid),"
527527
 " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)"
528528
 " FROM mlink JOIN filename ON filename.fnid=mlink.fnid"
529529
 " WHERE mlink.mid=%d"
530
- " ORDER BY name",
530
+ " ORDER BY name /*sort*/",
531531
 rid
532532
 );
533533
 while( db_step(&q)==SQLITE_ROW ){
534534
 const char *zName = db_column_text(&q,0);
535535
 int mperm = db_column_int(&q, 1);
@@ -1790,11 +1790,11 @@
17901790
 @ <input type="text" style="width:15;" name="tagname" value="%h(zNewTag)" />
17911791
 db_prepare(&q,
17921792
 "SELECT tag.tagid, tagname FROM tagxref, tag"
17931793
 " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
17941794
 " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
1795
- " ELSE tagname END",
1795
+ " ELSE tagname END /*sort*/",
17961796
 rid
17971797
 );
17981798
 while( db_step(&q)==SQLITE_ROW ){
17991799
 int tagid = db_column_int(&q, 0);
18001800
 const char *zTagName = db_column_text(&q, 1);
18011801
--- src/info.c
+++ src/info.c
@@ -190,11 +190,11 @@
190 " (SELECT uuid FROM blob WHERE rid=tagxref.srcid AND rid!=%d),"
191 " value, datetime(tagxref.mtime,'localtime'), tagtype,"
192 " (SELECT uuid FROM blob WHERE rid=tagxref.origid AND rid!=%d)"
193 " FROM tagxref JOIN tag ON tagxref.tagid=tag.tagid"
194 " WHERE tagxref.rid=%d AND tagname NOT GLOB '%s'"
195 " ORDER BY tagname", rid, rid, rid, zNotGlob
196 );
197 while( db_step(&q)==SQLITE_ROW ){
198 const char *zTagname = db_column_text(&q, 1);
199 const char *zSrcUuid = db_column_text(&q, 2);
200 const char *zValue = db_column_text(&q, 3);
@@ -525,11 +525,11 @@
525 " (SELECT uuid FROM blob WHERE rid=mlink.pid),"
526 " (SELECT uuid FROM blob WHERE rid=mlink.fid),"
527 " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)"
528 " FROM mlink JOIN filename ON filename.fnid=mlink.fnid"
529 " WHERE mlink.mid=%d"
530 " ORDER BY name",
531 rid
532 );
533 while( db_step(&q)==SQLITE_ROW ){
534 const char *zName = db_column_text(&q,0);
535 int mperm = db_column_int(&q, 1);
@@ -1790,11 +1790,11 @@
1790 @ <input type="text" style="width:15;" name="tagname" value="%h(zNewTag)" />
1791 db_prepare(&q,
1792 "SELECT tag.tagid, tagname FROM tagxref, tag"
1793 " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
1794 " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
1795 " ELSE tagname END",
1796 rid
1797 );
1798 while( db_step(&q)==SQLITE_ROW ){
1799 int tagid = db_column_int(&q, 0);
1800 const char *zTagName = db_column_text(&q, 1);
1801
--- src/info.c
+++ src/info.c
@@ -190,11 +190,11 @@
190 " (SELECT uuid FROM blob WHERE rid=tagxref.srcid AND rid!=%d),"
191 " value, datetime(tagxref.mtime,'localtime'), tagtype,"
192 " (SELECT uuid FROM blob WHERE rid=tagxref.origid AND rid!=%d)"
193 " FROM tagxref JOIN tag ON tagxref.tagid=tag.tagid"
194 " WHERE tagxref.rid=%d AND tagname NOT GLOB '%s'"
195 " ORDER BY tagname /*sort*/", rid, rid, rid, zNotGlob
196 );
197 while( db_step(&q)==SQLITE_ROW ){
198 const char *zTagname = db_column_text(&q, 1);
199 const char *zSrcUuid = db_column_text(&q, 2);
200 const char *zValue = db_column_text(&q, 3);
@@ -525,11 +525,11 @@
525 " (SELECT uuid FROM blob WHERE rid=mlink.pid),"
526 " (SELECT uuid FROM blob WHERE rid=mlink.fid),"
527 " (SELECT name FROM filename WHERE filename.fnid=mlink.pfnid)"
528 " FROM mlink JOIN filename ON filename.fnid=mlink.fnid"
529 " WHERE mlink.mid=%d"
530 " ORDER BY name /*sort*/",
531 rid
532 );
533 while( db_step(&q)==SQLITE_ROW ){
534 const char *zName = db_column_text(&q,0);
535 int mperm = db_column_int(&q, 1);
@@ -1790,11 +1790,11 @@
1790 @ <input type="text" style="width:15;" name="tagname" value="%h(zNewTag)" />
1791 db_prepare(&q,
1792 "SELECT tag.tagid, tagname FROM tagxref, tag"
1793 " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
1794 " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
1795 " ELSE tagname END /*sort*/",
1796 rid
1797 );
1798 while( db_step(&q)==SQLITE_ROW ){
1799 int tagid = db_column_int(&q, 0);
1800 const char *zTagName = db_column_text(&q, 1);
1801
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -333,11 +333,11 @@
333333
 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
334334
 " (SELECT uuid FROM blob WHERE rid=fid),"
335335
 " (SELECT uuid FROM blob WHERE rid=pid)"
336336
 " FROM mlink"
337337
 " WHERE mid=:mid AND pid!=fid"
338
- " ORDER BY 3"
338
+ " ORDER BY 3 /*sort*/"
339339
 );
340340
 fchngQueryInit = 1;
341341
 }
342342
 db_bind_int(&fchngQuery, ":mid", rid);
343343
 while( db_step(&fchngQuery)==SQLITE_ROW ){
344344
--- src/timeline.c
+++ src/timeline.c
@@ -333,11 +333,11 @@
333 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
334 " (SELECT uuid FROM blob WHERE rid=fid),"
335 " (SELECT uuid FROM blob WHERE rid=pid)"
336 " FROM mlink"
337 " WHERE mid=:mid AND pid!=fid"
338 " ORDER BY 3"
339 );
340 fchngQueryInit = 1;
341 }
342 db_bind_int(&fchngQuery, ":mid", rid);
343 while( db_step(&fchngQuery)==SQLITE_ROW ){
344
--- src/timeline.c
+++ src/timeline.c
@@ -333,11 +333,11 @@
333 " (SELECT name FROM filename WHERE fnid=mlink.fnid) AS name,"
334 " (SELECT uuid FROM blob WHERE rid=fid),"
335 " (SELECT uuid FROM blob WHERE rid=pid)"
336 " FROM mlink"
337 " WHERE mid=:mid AND pid!=fid"
338 " ORDER BY 3 /*sort*/"
339 );
340 fchngQueryInit = 1;
341 }
342 db_bind_int(&fchngQuery, ":mid", rid);
343 while( db_step(&fchngQuery)==SQLITE_ROW ){
344

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button