Fossil SCM

Additional tweaks and improvements to the "showsql" query parameter.

drh 2024-12-23 13:20 trunk
Commit 02491c2684fa125a696b8bec6a816fd473ade7e12c6d0e7e16eb035907a1e5a0
Parent ebd239de02c4b9f…
2 files changed +2 -2 +5 -5
~ src/db.c ~ src/timeline.c
M src/db.c
+2 -2
--- src/db.c
+++ src/db.c
@@ -657,12 +657,12 @@
657657
 if( zSql==0 ) return;
658658
 nSql = strlen(zSql);
659659
 while( nSql>0 && fossil_isspace(zSql[0]) ){ nSql--; zSql++; }
660660
 while( nSql>0 && fossil_isspace(zSql[nSql-1]) ) nSql--;
661661
 if( nSql<6 ) return;
662
- if( strncmp(zSql, "SELECT", 6)==0 ) return;
663
- if( strncmp(zSql, "PRAGMA", 6)==0 ) return;
662
+ if( fossil_strnicmp(zSql, "SELECT", 6)==0 ) return;
663
+ if( fossil_strnicmp(zSql, "PRAGMA", 6)==0 ) return;
664664
 blob_append(db.pDmlLog, zSql, nSql);
665665
 if( zSql[nSql-1]!=';' ) blob_append_char(db.pDmlLog, ';');
666666
 blob_append_char(db.pDmlLog, '\n');
667667
 }
668668
669669
--- src/db.c
+++ src/db.c
@@ -657,12 +657,12 @@
657 if( zSql==0 ) return;
658 nSql = strlen(zSql);
659 while( nSql>0 && fossil_isspace(zSql[0]) ){ nSql--; zSql++; }
660 while( nSql>0 && fossil_isspace(zSql[nSql-1]) ) nSql--;
661 if( nSql<6 ) return;
662 if( strncmp(zSql, "SELECT", 6)==0 ) return;
663 if( strncmp(zSql, "PRAGMA", 6)==0 ) return;
664 blob_append(db.pDmlLog, zSql, nSql);
665 if( zSql[nSql-1]!=';' ) blob_append_char(db.pDmlLog, ';');
666 blob_append_char(db.pDmlLog, '\n');
667 }
668
669
--- src/db.c
+++ src/db.c
@@ -657,12 +657,12 @@
657 if( zSql==0 ) return;
658 nSql = strlen(zSql);
659 while( nSql>0 && fossil_isspace(zSql[0]) ){ nSql--; zSql++; }
660 while( nSql>0 && fossil_isspace(zSql[nSql-1]) ) nSql--;
661 if( nSql<6 ) return;
662 if( fossil_strnicmp(zSql, "SELECT", 6)==0 ) return;
663 if( fossil_strnicmp(zSql, "PRAGMA", 6)==0 ) return;
664 blob_append(db.pDmlLog, zSql, nSql);
665 if( zSql[nSql-1]!=';' ) blob_append_char(db.pDmlLog, ';');
666 blob_append_char(db.pDmlLog, '\n');
667 }
668
669
M src/timeline.c
+5 -5
--- src/timeline.c
+++ src/timeline.c
@@ -2864,31 +2864,31 @@
28642864
 rCirca = symbolic_name_to_mtime(zCirca, &zCirca);
28652865
 blob_append_sql(&sql, "%s", blob_sql_text(&cond));
28662866
 if( rAfter>0.0 ){
28672867
 if( rBefore>0.0 ){
28682868
 blob_append_sql(&sql,
2869
- " AND event.mtime>=%.17g AND event.mtime<=%.17g"
2869
+ " AND event.mtime>=%.17g AND event.mtime<=%.17g\n"
28702870
 " ORDER BY event.mtime ASC", rAfter-ONE_SECOND, rBefore+ONE_SECOND);
28712871
 nEntry = -1;
28722872
 }else{
28732873
 blob_append_sql(&sql,
2874
- " AND event.mtime>=%.17g ORDER BY event.mtime ASC",
2874
+ " AND event.mtime>=%.17g\n ORDER BY event.mtime ASC",
28752875
 rAfter-ONE_SECOND);
28762876
 }
28772877
 zCirca = 0;
28782878
 url_add_parameter(&url, "c", 0);
28792879
 }else if( rBefore>0.0 ){
28802880
 blob_append_sql(&sql,
2881
- " AND event.mtime<=%.17g ORDER BY event.mtime DESC",
2881
+ " AND event.mtime<=%.17g\n ORDER BY event.mtime DESC",
28822882
 rBefore+ONE_SECOND);
28832883
 zCirca = 0;
28842884
 url_add_parameter(&url, "c", 0);
28852885
 }else if( rCirca>0.0 ){
28862886
 Blob sql2;
28872887
 blob_init(&sql2, blob_sql_text(&sql), -1);
28882888
 blob_append_sql(&sql2,
2889
- " AND event.mtime>=%f ORDER BY event.mtime ASC", rCirca);
2889
+ " AND event.mtime>=%f\n ORDER BY event.mtime ASC", rCirca);
28902890
 if( nEntry>0 ){
28912891
 blob_append_sql(&sql2," LIMIT %d", (nEntry+1)/2);
28922892
 }
28932893
 db_multi_exec("%s", blob_sql_text(&sql2));
28942894
 if( nEntry>0 ){
@@ -2895,11 +2895,11 @@
28952895
 nEntry -= db_int(0,"select count(*) from timeline");
28962896
 if( nEntry<=0 ) nEntry = 1;
28972897
 }
28982898
 blob_reset(&sql2);
28992899
 blob_append_sql(&sql,
2900
- " AND event.mtime<=%f ORDER BY event.mtime DESC",
2900
+ " AND event.mtime<=%f\n ORDER BY event.mtime DESC",
29012901
 rCirca
29022902
 );
29032903
 if( zMark==0 ) zMark = zCirca;
29042904
 }else{
29052905
 blob_append_sql(&sql, " ORDER BY event.mtime DESC");
29062906
--- src/timeline.c
+++ src/timeline.c
@@ -2864,31 +2864,31 @@
2864 rCirca = symbolic_name_to_mtime(zCirca, &zCirca);
2865 blob_append_sql(&sql, "%s", blob_sql_text(&cond));
2866 if( rAfter>0.0 ){
2867 if( rBefore>0.0 ){
2868 blob_append_sql(&sql,
2869 " AND event.mtime>=%.17g AND event.mtime<=%.17g"
2870 " ORDER BY event.mtime ASC", rAfter-ONE_SECOND, rBefore+ONE_SECOND);
2871 nEntry = -1;
2872 }else{
2873 blob_append_sql(&sql,
2874 " AND event.mtime>=%.17g ORDER BY event.mtime ASC",
2875 rAfter-ONE_SECOND);
2876 }
2877 zCirca = 0;
2878 url_add_parameter(&url, "c", 0);
2879 }else if( rBefore>0.0 ){
2880 blob_append_sql(&sql,
2881 " AND event.mtime<=%.17g ORDER BY event.mtime DESC",
2882 rBefore+ONE_SECOND);
2883 zCirca = 0;
2884 url_add_parameter(&url, "c", 0);
2885 }else if( rCirca>0.0 ){
2886 Blob sql2;
2887 blob_init(&sql2, blob_sql_text(&sql), -1);
2888 blob_append_sql(&sql2,
2889 " AND event.mtime>=%f ORDER BY event.mtime ASC", rCirca);
2890 if( nEntry>0 ){
2891 blob_append_sql(&sql2," LIMIT %d", (nEntry+1)/2);
2892 }
2893 db_multi_exec("%s", blob_sql_text(&sql2));
2894 if( nEntry>0 ){
@@ -2895,11 +2895,11 @@
2895 nEntry -= db_int(0,"select count(*) from timeline");
2896 if( nEntry<=0 ) nEntry = 1;
2897 }
2898 blob_reset(&sql2);
2899 blob_append_sql(&sql,
2900 " AND event.mtime<=%f ORDER BY event.mtime DESC",
2901 rCirca
2902 );
2903 if( zMark==0 ) zMark = zCirca;
2904 }else{
2905 blob_append_sql(&sql, " ORDER BY event.mtime DESC");
2906
--- src/timeline.c
+++ src/timeline.c
@@ -2864,31 +2864,31 @@
2864 rCirca = symbolic_name_to_mtime(zCirca, &zCirca);
2865 blob_append_sql(&sql, "%s", blob_sql_text(&cond));
2866 if( rAfter>0.0 ){
2867 if( rBefore>0.0 ){
2868 blob_append_sql(&sql,
2869 " AND event.mtime>=%.17g AND event.mtime<=%.17g\n"
2870 " ORDER BY event.mtime ASC", rAfter-ONE_SECOND, rBefore+ONE_SECOND);
2871 nEntry = -1;
2872 }else{
2873 blob_append_sql(&sql,
2874 " AND event.mtime>=%.17g\n ORDER BY event.mtime ASC",
2875 rAfter-ONE_SECOND);
2876 }
2877 zCirca = 0;
2878 url_add_parameter(&url, "c", 0);
2879 }else if( rBefore>0.0 ){
2880 blob_append_sql(&sql,
2881 " AND event.mtime<=%.17g\n ORDER BY event.mtime DESC",
2882 rBefore+ONE_SECOND);
2883 zCirca = 0;
2884 url_add_parameter(&url, "c", 0);
2885 }else if( rCirca>0.0 ){
2886 Blob sql2;
2887 blob_init(&sql2, blob_sql_text(&sql), -1);
2888 blob_append_sql(&sql2,
2889 " AND event.mtime>=%f\n ORDER BY event.mtime ASC", rCirca);
2890 if( nEntry>0 ){
2891 blob_append_sql(&sql2," LIMIT %d", (nEntry+1)/2);
2892 }
2893 db_multi_exec("%s", blob_sql_text(&sql2));
2894 if( nEntry>0 ){
@@ -2895,11 +2895,11 @@
2895 nEntry -= db_int(0,"select count(*) from timeline");
2896 if( nEntry<=0 ) nEntry = 1;
2897 }
2898 blob_reset(&sql2);
2899 blob_append_sql(&sql,
2900 " AND event.mtime<=%f\n ORDER BY event.mtime DESC",
2901 rCirca
2902 );
2903 if( zMark==0 ) zMark = zCirca;
2904 }else{
2905 blob_append_sql(&sql, " ORDER BY event.mtime DESC");
2906

Keyboard Shortcuts

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