nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-31 03:34:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support strict result ordering in list for consistent regression answers.

Browse Source
This commit is contained in:
Andrew McMillan 2011-09-19 08:41:27 +12:00
parent 45ed6fb3f4
commit 1e81d0325e
4 changed files with 1600 additions and 1596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/tz/list.php
View File

@ -28,6 +28,9 @@ if ( !empty($changedsince) ) {
} }
if ( !empty($where)) $sql .= ' WHERE '.$where; if ( !empty($where)) $sql .= ' WHERE '.$where;
if ( !empty($c->strict_result_ordering) && $c->strict_result_ordering ) {
$sql .= ' ORDER BY tzid';
}
/* /*
<dtstamp>2009-10-11T09:32:11Z</dtstamp> <dtstamp>2009-10-11T09:32:11Z</dtstamp>
<summary> <summary>

22
testing/tests/timezone/5010-list.result
View File

@ -8,72 +8,72 @@ Content-Type: application/xml; charset="utf-8"
<dtstamp>all good</dtstamp> <dtstamp>all good</dtstamp>
<summary> <summary>
<tzid>Pacific/Auckland</tzid> <tzid>Pacific/Auckland</tzid>
<last-modified>20110919T032240Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<local-name lang="en_US">Pacific/Auckland</local-name> <local-name lang="en_US">Pacific/Auckland</local-name>
</summary> </summary>
<summary> <summary>
<tzid>America/Los_Angeles</tzid> <tzid>America/Los_Angeles</tzid>
<last-modified>20110918T082240Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<local-name lang="en_US">America/Los_Angeles</local-name> <local-name lang="en_US">America/Los_Angeles</local-name>
</summary> </summary>
<summary> <summary>
<tzid>Europe/Helsinki</tzid> <tzid>Europe/Helsinki</tzid>
<last-modified>20110918T182240Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<local-name lang="en_US">Europe/Helsinki</local-name> <local-name lang="en_US">Europe/Helsinki</local-name>
</summary> </summary>
<summary> <summary>
<tzid>New Zealand Standard Time</tzid> <tzid>New Zealand Standard Time</tzid>
<last-modified>20110919T032248Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<alias>Pacific/Auckland</alias> <alias>Pacific/Auckland</alias>
<local-name lang="en_US">New Zealand Standard Time</local-name> <local-name lang="en_US">New Zealand Standard Time</local-name>
</summary> </summary>
<summary> <summary>
<tzid>/softwarestudio.org/Olson_20011030_5/Pacific/Auckland</tzid> <tzid>/softwarestudio.org/Olson_20011030_5/Pacific/Auckland</tzid>
<last-modified>20110919T032253Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<alias>Pacific/Auckland</alias> <alias>Pacific/Auckland</alias>
<local-name lang="en_US">/softwarestudio.org/Olson_20011030_5/Pacific/Auckland</local-name> <local-name lang="en_US">/softwarestudio.org/Olson_20011030_5/Pacific/Auckland</local-name>
</summary> </summary>
<summary> <summary>
<tzid>/mozilla.org/20050126_1/Pacific/Auckland</tzid> <tzid>/mozilla.org/20050126_1/Pacific/Auckland</tzid>
<last-modified>20110919T032256Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<alias>Pacific/Auckland</alias> <alias>Pacific/Auckland</alias>
<local-name lang="en_US">/mozilla.org/20050126_1/Pacific/Auckland</local-name> <local-name lang="en_US">/mozilla.org/20050126_1/Pacific/Auckland</local-name>
</summary> </summary>
<summary> <summary>
<tzid>/mozilla.org/20050126_1/Antarctica/McMurdo</tzid> <tzid>/mozilla.org/20050126_1/Antarctica/McMurdo</tzid>
<last-modified>20110919T032256Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<alias>Antarctica/McMurdo</alias> <alias>Antarctica/McMurdo</alias>
<local-name lang="en_US">/mozilla.org/20050126_1/Antarctica/McMurdo</local-name> <local-name lang="en_US">/mozilla.org/20050126_1/Antarctica/McMurdo</local-name>
</summary> </summary>
<summary> <summary>
<tzid>/mozilla.org/20070129_1/Antarctica/McMurdo</tzid> <tzid>/mozilla.org/20070129_1/Antarctica/McMurdo</tzid>
<last-modified>20110919T032258Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<alias>Antarctica/McMurdo</alias> <alias>Antarctica/McMurdo</alias>
<local-name lang="en_US">/mozilla.org/20070129_1/Antarctica/McMurdo</local-name> <local-name lang="en_US">/mozilla.org/20070129_1/Antarctica/McMurdo</local-name>
</summary> </summary>
<summary> <summary>
<tzid>Europe/Prague</tzid> <tzid>Europe/Prague</tzid>
<last-modified>20110919T032319Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<local-name lang="en_US">Europe/Prague</local-name> <local-name lang="en_US">Europe/Prague</local-name>
</summary> </summary>
<summary> <summary>
<tzid>America/New_York</tzid> <tzid>America/New_York</tzid>
<last-modified>20110918T112328Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<local-name lang="en_US">America/New_York</local-name> <local-name lang="en_US">America/New_York</local-name>
</summary> </summary>
<summary> <summary>
<tzid>(UTC-05:00) Eastern Time (US &amp; Canada)</tzid> <tzid>(UTC-05:00) Eastern Time (US &amp; Canada)</tzid>
<last-modified>20110918T112401Z</last-modified> <last-modified>all good</last-modified>
<inactive/> <inactive/>
<alias>America/New_York</alias> <alias>America/New_York</alias>
<local-name lang="en_US">(UTC-05:00) Eastern Time (US &amp; Canada)</local-name> <local-name lang="en_US">(UTC-05:00) Eastern Time (US &amp; Canada)</local-name>

1
testing/tests/timezone/5010-list.test
View File

@ -6,3 +6,4 @@ URL=http://regression.host/tz.php?action=list&returnall&lang=en_US
HEAD HEAD
REPLACE=/dtstamp>[0-9TZ]{16}/dtstamp>all good/ REPLACE=/dtstamp>[0-9TZ]{16}/dtstamp>all good/
REPLACE=/last-modified>[0-9TZ]{16}/last-modified>all good/

3170
testing/tests/timezone/5021-list.result
View File

File diff suppressed because it is too large Load Diff