Fossil SCM

Deal with the fact that the Fossil repository has a few null users. Instead of having them match everything, including nonexistent users, make them match nothing.

andygoth 2015-05-18 02:36 UTC andygoth-user-reports

Commit cbbee17312070895347430f81784e81d142441dd

Parent 60018f9d8ab75b6…

1 file changed +6 -6

~ src/statrep.c

M src/statrep.c

+6 -6

		--- src/statrep.c
		+++ src/statrep.c
		@@ -262,11 +262,11 @@
262	262	blob_reset(&userFilter);
263	263	db_prepare(&query,
264	264	"SELECT substr(date(mtime),1,%d) AS timeframe,"
265	265	" count(*) AS eventCount"
266	266	" FROM v_reports"
267		- " WHERE ifnull(user=%Q,1)"
	267	+ " WHERE ifnull(coalesce(euser,user,'')=%Q,1)"
268	268	" GROUP BY timeframe"
269	269	" ORDER BY timeframe DESC",
270	270	includeMonth ? 7 : 4, zUserName);
271	271	@ <h1>Timeline Events (%s(stats_report_label_for_type()))
272	272	@ by year%s(includeMonth ? "/month" : "")
		@@ -478,11 +478,11 @@
478	478	"INSERT INTO statrep(filename, cnt)"
479	479	" SELECT filename.name, count(distinct mlink.mid)"
480	480	" FROM filename, mlink, event"
481	481	" WHERE filename.fnid=mlink.fnid"
482	482	" AND mlink.mid=event.objid"
483		- " AND ifnull(ifnull(euser,user)=%Q,1)"
	483	+ " AND ifnull(coalesce(euser,user,'')=%Q,1)"
484	484	" GROUP BY 1", zUserName
485	485	);
486	486	db_prepare(&query,
487	487	"SELECT filename, cnt FROM statrep ORDER BY cnt DESC, filename /sort/"
488	488	);
		@@ -545,21 +545,21 @@
545	545	stats_report_event_types_menu("byweekday", blob_str(&userFilter));
546	546	db_prepare(&query,
547	547	"SELECT cast(mtime %% 7 AS INTEGER) dow,"
548	548	" COUNT(*) AS eventCount"
549	549	" FROM v_reports"
550		- " WHERE ifnull(ifnull(euser,user)=%Q,1)"
	550	+ " WHERE ifnull(coalesce(euser,user,'')=%Q,1)"
551	551	" GROUP BY dow ORDER BY dow", zUserName);
552	552	@ <h1>Timeline Events (%h(stats_report_label_for_type())) by Day of the Week
553	553	if( zUserName ){
554	554	@ for user %h(zUserName)
555	555	}
556	556	@ </h1>
557	557	db_multi_exec(
558	558	"CREATE TEMP TABLE piechart(amt,label);"
559	559	"INSERT INTO piechart SELECT count(*), cast(mtime %% 7 AS INT) FROM v_reports"
560		- " WHERE ifnull(ifnull(euser,user)=%Q,1)"
	560	+ " WHERE ifnull(coalesce(euser,user,'')=%Q,1)"
561	561	" GROUP BY 2 ORDER BY 2;"
562	562	"UPDATE piechart SET label = CASE label WHEN 0 THEN 'Monday' WHEN 1 THEN 'Tuesday'"
563	563	" WHEN 2 THEN 'Wednesday' WHEN 3 THEN 'Thursday' WHEN 4 THEN 'Friday'"
564	564	" WHEN 5 THEN 'Saturday' ELSE 'Sunday' END;", zUserName
565	565	);
		@@ -636,11 +636,11 @@
636	636	stats_report_event_types_menu("byweek", blob_str(&urlParams));
637	637	blob_reset(&urlParams);
638	638	db_prepare(&qYears,
639	639	"SELECT DISTINCT substr(date(mtime),1,4) AS y"
640	640	" FROM v_reports"
641		- " WHERE ifnull(ifnull(euser,user)=%Q,1)"
	641	+ " WHERE ifnull(coalesce(euser,user,'')=%Q,1)"
642	642	" GROUP BY y ORDER BY y", zUserName);
643	643	cgi_printf("Select year: ");
644	644	while( SQLITE_ROW == db_step(&qYears) ){
645	645	const char *zT = db_column_text(&qYears, 0);
646	646	if( i++ ){
		@@ -668,11 +668,11 @@
668	668	"SELECT DISTINCT strftime('%%W',mtime) AS wk, "
669	669	" count(*) AS n "
670	670	" FROM v_reports "
671	671	" WHERE %Q=substr(date(mtime),1,4) "
672	672	" AND mtime < current_timestamp "
673		- " AND ifnull(ifnull(euser,user)=%Q,1)"
	673	+ " AND ifnull(coalesce(euser,user,'')=%Q,1)"
674	674	" GROUP BY wk ORDER BY wk DESC", zYear, zUserName);
675	675	@ <h1>Timeline events (%h(stats_report_label_for_type()))
676	676	@ for the calendar weeks of %h(zYear)
677	677	if( zUserName ){
678	678	@ for user %h(zUserName)
679	679

	--- src/statrep.c
	+++ src/statrep.c
	@@ -262,11 +262,11 @@
262	blob_reset(&userFilter);
263	db_prepare(&query,
264	"SELECT substr(date(mtime),1,%d) AS timeframe,"
265	" count(*) AS eventCount"
266	" FROM v_reports"
267	" WHERE ifnull(user=%Q,1)"
268	" GROUP BY timeframe"
269	" ORDER BY timeframe DESC",
270	includeMonth ? 7 : 4, zUserName);
271	@ <h1>Timeline Events (%s(stats_report_label_for_type()))
272	@ by year%s(includeMonth ? "/month" : "")
	@@ -478,11 +478,11 @@
478	"INSERT INTO statrep(filename, cnt)"
479	" SELECT filename.name, count(distinct mlink.mid)"
480	" FROM filename, mlink, event"
481	" WHERE filename.fnid=mlink.fnid"
482	" AND mlink.mid=event.objid"
483	" AND ifnull(ifnull(euser,user)=%Q,1)"
484	" GROUP BY 1", zUserName
485	);
486	db_prepare(&query,
487	"SELECT filename, cnt FROM statrep ORDER BY cnt DESC, filename /sort/"
488	);
	@@ -545,21 +545,21 @@
545	stats_report_event_types_menu("byweekday", blob_str(&userFilter));
546	db_prepare(&query,
547	"SELECT cast(mtime %% 7 AS INTEGER) dow,"
548	" COUNT(*) AS eventCount"
549	" FROM v_reports"
550	" WHERE ifnull(ifnull(euser,user)=%Q,1)"
551	" GROUP BY dow ORDER BY dow", zUserName);
552	@ <h1>Timeline Events (%h(stats_report_label_for_type())) by Day of the Week
553	if( zUserName ){
554	@ for user %h(zUserName)
555	}
556	@ </h1>
557	db_multi_exec(
558	"CREATE TEMP TABLE piechart(amt,label);"
559	"INSERT INTO piechart SELECT count(*), cast(mtime %% 7 AS INT) FROM v_reports"
560	" WHERE ifnull(ifnull(euser,user)=%Q,1)"
561	" GROUP BY 2 ORDER BY 2;"
562	"UPDATE piechart SET label = CASE label WHEN 0 THEN 'Monday' WHEN 1 THEN 'Tuesday'"
563	" WHEN 2 THEN 'Wednesday' WHEN 3 THEN 'Thursday' WHEN 4 THEN 'Friday'"
564	" WHEN 5 THEN 'Saturday' ELSE 'Sunday' END;", zUserName
565	);
	@@ -636,11 +636,11 @@
636	stats_report_event_types_menu("byweek", blob_str(&urlParams));
637	blob_reset(&urlParams);
638	db_prepare(&qYears,
639	"SELECT DISTINCT substr(date(mtime),1,4) AS y"
640	" FROM v_reports"
641	" WHERE ifnull(ifnull(euser,user)=%Q,1)"
642	" GROUP BY y ORDER BY y", zUserName);
643	cgi_printf("Select year: ");
644	while( SQLITE_ROW == db_step(&qYears) ){
645	const char *zT = db_column_text(&qYears, 0);
646	if( i++ ){
	@@ -668,11 +668,11 @@
668	"SELECT DISTINCT strftime('%%W',mtime) AS wk, "
669	" count(*) AS n "
670	" FROM v_reports "
671	" WHERE %Q=substr(date(mtime),1,4) "
672	" AND mtime < current_timestamp "
673	" AND ifnull(ifnull(euser,user)=%Q,1)"
674	" GROUP BY wk ORDER BY wk DESC", zYear, zUserName);
675	@ <h1>Timeline events (%h(stats_report_label_for_type()))
676	@ for the calendar weeks of %h(zYear)
677	if( zUserName ){
678	@ for user %h(zUserName)
679

	--- src/statrep.c
	+++ src/statrep.c
	@@ -262,11 +262,11 @@
262	blob_reset(&userFilter);
263	db_prepare(&query,
264	"SELECT substr(date(mtime),1,%d) AS timeframe,"
265	" count(*) AS eventCount"
266	" FROM v_reports"
267	" WHERE ifnull(coalesce(euser,user,'')=%Q,1)"
268	" GROUP BY timeframe"
269	" ORDER BY timeframe DESC",
270	includeMonth ? 7 : 4, zUserName);
271	@ <h1>Timeline Events (%s(stats_report_label_for_type()))
272	@ by year%s(includeMonth ? "/month" : "")
	@@ -478,11 +478,11 @@
478	"INSERT INTO statrep(filename, cnt)"
479	" SELECT filename.name, count(distinct mlink.mid)"
480	" FROM filename, mlink, event"
481	" WHERE filename.fnid=mlink.fnid"
482	" AND mlink.mid=event.objid"
483	" AND ifnull(coalesce(euser,user,'')=%Q,1)"
484	" GROUP BY 1", zUserName
485	);
486	db_prepare(&query,
487	"SELECT filename, cnt FROM statrep ORDER BY cnt DESC, filename /sort/"
488	);
	@@ -545,21 +545,21 @@
545	stats_report_event_types_menu("byweekday", blob_str(&userFilter));
546	db_prepare(&query,
547	"SELECT cast(mtime %% 7 AS INTEGER) dow,"
548	" COUNT(*) AS eventCount"
549	" FROM v_reports"
550	" WHERE ifnull(coalesce(euser,user,'')=%Q,1)"
551	" GROUP BY dow ORDER BY dow", zUserName);
552	@ <h1>Timeline Events (%h(stats_report_label_for_type())) by Day of the Week
553	if( zUserName ){
554	@ for user %h(zUserName)
555	}
556	@ </h1>
557	db_multi_exec(
558	"CREATE TEMP TABLE piechart(amt,label);"
559	"INSERT INTO piechart SELECT count(*), cast(mtime %% 7 AS INT) FROM v_reports"
560	" WHERE ifnull(coalesce(euser,user,'')=%Q,1)"
561	" GROUP BY 2 ORDER BY 2;"
562	"UPDATE piechart SET label = CASE label WHEN 0 THEN 'Monday' WHEN 1 THEN 'Tuesday'"
563	" WHEN 2 THEN 'Wednesday' WHEN 3 THEN 'Thursday' WHEN 4 THEN 'Friday'"
564	" WHEN 5 THEN 'Saturday' ELSE 'Sunday' END;", zUserName
565	);
	@@ -636,11 +636,11 @@
636	stats_report_event_types_menu("byweek", blob_str(&urlParams));
637	blob_reset(&urlParams);
638	db_prepare(&qYears,
639	"SELECT DISTINCT substr(date(mtime),1,4) AS y"
640	" FROM v_reports"
641	" WHERE ifnull(coalesce(euser,user,'')=%Q,1)"
642	" GROUP BY y ORDER BY y", zUserName);
643	cgi_printf("Select year: ");
644	while( SQLITE_ROW == db_step(&qYears) ){
645	const char *zT = db_column_text(&qYears, 0);
646	if( i++ ){
	@@ -668,11 +668,11 @@
668	"SELECT DISTINCT strftime('%%W',mtime) AS wk, "
669	" count(*) AS n "
670	" FROM v_reports "
671	" WHERE %Q=substr(date(mtime),1,4) "
672	" AND mtime < current_timestamp "
673	" AND ifnull(coalesce(euser,user,'')=%Q,1)"
674	" GROUP BY wk ORDER BY wk DESC", zYear, zUserName);
675	@ <h1>Timeline events (%h(stats_report_label_for_type()))
676	@ for the calendar weeks of %h(zYear)
677	if( zUserName ){
678	@ for user %h(zUserName)
679

Fossil SCM

Keyboard Shortcuts