Fossil SCM

Add /*sort*/ marks to some SQL queries to disable warnings about sorting without an index.

drh 2011-10-14 00:06 trunk
Commit fff43ebb5bc8baa7d8de7938a1c14cf2e7f97438
Parent 4d32db8ef8110b5…
4 files changed +2 -2 +1 -1 +1 -1 +2 -2
~ src/db.c ~ src/info.c ~ src/login.c ~ src/name.c
M src/db.c
+2 -2
--- src/db.c
+++ src/db.c
@@ -742,20 +742,20 @@
742742
 /*
743743
 * * Returns TRUE if zTable exists in the local database.
744744
 */
745745
 static int db_local_table_exists(const char *zTable){
746746
 return db_exists("SELECT 1 FROM %s.sqlite_master"
747
- " WHERE name=='%s'",
747
+ " WHERE name=='%s' /*scan*/",
748748
 db_name("localdb"), zTable);
749749
 }
750750
751751
 /*
752752
 ** Returns TRUE if zColumn exists in zTable in the local database.
753753
 */
754754
 static int db_local_column_exists(const char *zTable, const char *zColumn){
755755
 return db_exists("SELECT 1 FROM %s.sqlite_master"
756
- " WHERE name=='%s' AND sql GLOB '* %s *'",
756
+ " WHERE name=='%s' AND sql GLOB '* %s *' /*scan*/",
757757
 db_name("localdb"), zTable, zColumn);
758758
 }
759759
760760
 /*
761761
 ** If zDbName is a valid local database file, open it and return
762762
--- src/db.c
+++ src/db.c
@@ -742,20 +742,20 @@
742 /*
743 * * Returns TRUE if zTable exists in the local database.
744 */
745 static int db_local_table_exists(const char *zTable){
746 return db_exists("SELECT 1 FROM %s.sqlite_master"
747 " WHERE name=='%s'",
748 db_name("localdb"), zTable);
749 }
750
751 /*
752 ** Returns TRUE if zColumn exists in zTable in the local database.
753 */
754 static int db_local_column_exists(const char *zTable, const char *zColumn){
755 return db_exists("SELECT 1 FROM %s.sqlite_master"
756 " WHERE name=='%s' AND sql GLOB '* %s *'",
757 db_name("localdb"), zTable, zColumn);
758 }
759
760 /*
761 ** If zDbName is a valid local database file, open it and return
762
--- src/db.c
+++ src/db.c
@@ -742,20 +742,20 @@
742 /*
743 * * Returns TRUE if zTable exists in the local database.
744 */
745 static int db_local_table_exists(const char *zTable){
746 return db_exists("SELECT 1 FROM %s.sqlite_master"
747 " WHERE name=='%s' /*scan*/",
748 db_name("localdb"), zTable);
749 }
750
751 /*
752 ** Returns TRUE if zColumn exists in zTable in the local database.
753 */
754 static int db_local_column_exists(const char *zTable, const char *zColumn){
755 return db_exists("SELECT 1 FROM %s.sqlite_master"
756 " WHERE name=='%s' AND sql GLOB '* %s *' /*scan*/",
757 db_name("localdb"), zTable, zColumn);
758 }
759
760 /*
761 ** If zDbName is a valid local database file, open it and return
762
M src/info.c
+1 -1
--- src/info.c
+++ src/info.c
@@ -797,11 +797,11 @@
797797
 " WHERE filename.fnid=mlink.fnid"
798798
 " AND event.objid=mlink.mid"
799799
 " AND a.rid=mlink.fid"
800800
 " AND b.rid=mlink.mid"
801801
 " AND mlink.fid=%d"
802
- " ORDER BY filename.name, event.mtime",
802
+ " ORDER BY filename.name, event.mtime /*sort*/",
803803
 TAG_BRANCH, rid
804804
 );
805805
 @ <ul>
806806
 while( db_step(&q)==SQLITE_ROW ){
807807
 const char *zName = db_column_text(&q, 0);
808808
--- src/info.c
+++ src/info.c
@@ -797,11 +797,11 @@
797 " WHERE filename.fnid=mlink.fnid"
798 " AND event.objid=mlink.mid"
799 " AND a.rid=mlink.fid"
800 " AND b.rid=mlink.mid"
801 " AND mlink.fid=%d"
802 " ORDER BY filename.name, event.mtime",
803 TAG_BRANCH, rid
804 );
805 @ <ul>
806 while( db_step(&q)==SQLITE_ROW ){
807 const char *zName = db_column_text(&q, 0);
808
--- src/info.c
+++ src/info.c
@@ -797,11 +797,11 @@
797 " WHERE filename.fnid=mlink.fnid"
798 " AND event.objid=mlink.mid"
799 " AND a.rid=mlink.fid"
800 " AND b.rid=mlink.mid"
801 " AND mlink.fid=%d"
802 " ORDER BY filename.name, event.mtime /*sort*/",
803 TAG_BRANCH, rid
804 );
805 @ <ul>
806 while( db_step(&q)==SQLITE_ROW ){
807 const char *zName = db_column_text(&q, 0);
808
M src/login.c
+1 -1
--- src/login.c
+++ src/login.c
@@ -91,11 +91,11 @@
9191
 if( zCookieName==0 ){
9292
 zCookieName = db_text(0,
9393
 "SELECT 'fossil-' || substr(value,1,16)"
9494
 " FROM config"
9595
 " WHERE name IN ('project-code','login-group-code')"
96
- " ORDER BY name;"
96
+ " ORDER BY name /*sort*/"
9797
 );
9898
 }
9999
 return zCookieName;
100100
 }
101101
102102
--- src/login.c
+++ src/login.c
@@ -91,11 +91,11 @@
91 if( zCookieName==0 ){
92 zCookieName = db_text(0,
93 "SELECT 'fossil-' || substr(value,1,16)"
94 " FROM config"
95 " WHERE name IN ('project-code','login-group-code')"
96 " ORDER BY name;"
97 );
98 }
99 return zCookieName;
100 }
101
102
--- src/login.c
+++ src/login.c
@@ -91,11 +91,11 @@
91 if( zCookieName==0 ){
92 zCookieName = db_text(0,
93 "SELECT 'fossil-' || substr(value,1,16)"
94 " FROM config"
95 " WHERE name IN ('project-code','login-group-code')"
96 " ORDER BY name /*sort*/"
97 );
98 }
99 return zCookieName;
100 }
101
102
M src/name.c
+2 -2
--- src/name.c
+++ src/name.c
@@ -154,11 +154,11 @@
154154
 " WHERE tag.tagname='sym-%q' "
155155
 " AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 "
156156
 " AND event.objid=tagxref.rid "
157157
 " AND blob.rid=event.objid "
158158
 " AND event.type GLOB '%q'"
159
- " ORDER BY event.mtime DESC ",
159
+ " ORDER BY event.mtime DESC /*sort*/",
160160
 zTag, zType
161161
 );
162162
 if( zUuid==0 ){
163163
 int nTag = strlen(zTag);
164164
 int i;
@@ -180,11 +180,11 @@
180180
 " AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 "
181181
 " AND event.objid=tagxref.rid "
182182
 " AND blob.rid=event.objid "
183183
 " AND event.mtime<=julianday(%Q %s)"
184184
 " AND event.type GLOB '%q'"
185
- " ORDER BY event.mtime DESC ",
185
+ " ORDER BY event.mtime DESC /*sort*/ ",
186186
 zTagBase, zDate, (useUtc ? "" : ",'utc'"), zType
187187
 );
188188
 break;
189189
 }
190190
 }
191191
--- src/name.c
+++ src/name.c
@@ -154,11 +154,11 @@
154 " WHERE tag.tagname='sym-%q' "
155 " AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 "
156 " AND event.objid=tagxref.rid "
157 " AND blob.rid=event.objid "
158 " AND event.type GLOB '%q'"
159 " ORDER BY event.mtime DESC ",
160 zTag, zType
161 );
162 if( zUuid==0 ){
163 int nTag = strlen(zTag);
164 int i;
@@ -180,11 +180,11 @@
180 " AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 "
181 " AND event.objid=tagxref.rid "
182 " AND blob.rid=event.objid "
183 " AND event.mtime<=julianday(%Q %s)"
184 " AND event.type GLOB '%q'"
185 " ORDER BY event.mtime DESC ",
186 zTagBase, zDate, (useUtc ? "" : ",'utc'"), zType
187 );
188 break;
189 }
190 }
191
--- src/name.c
+++ src/name.c
@@ -154,11 +154,11 @@
154 " WHERE tag.tagname='sym-%q' "
155 " AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 "
156 " AND event.objid=tagxref.rid "
157 " AND blob.rid=event.objid "
158 " AND event.type GLOB '%q'"
159 " ORDER BY event.mtime DESC /*sort*/",
160 zTag, zType
161 );
162 if( zUuid==0 ){
163 int nTag = strlen(zTag);
164 int i;
@@ -180,11 +180,11 @@
180 " AND tagxref.tagid=tag.tagid AND tagxref.tagtype>0 "
181 " AND event.objid=tagxref.rid "
182 " AND blob.rid=event.objid "
183 " AND event.mtime<=julianday(%Q %s)"
184 " AND event.type GLOB '%q'"
185 " ORDER BY event.mtime DESC /*sort*/ ",
186 zTagBase, zDate, (useUtc ? "" : ",'utc'"), zType
187 );
188 break;
189 }
190 }
191

Keyboard Shortcuts

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