diff --git a/testing/tests/regression-suite/0243-Moz-POST-FB.test b/testing/tests/regression-suite/0243-Moz-POST-FB.test index 6690bc8d..eb6e8f35 100644 --- a/testing/tests/regression-suite/0243-Moz-POST-FB.test +++ b/testing/tests/regression-suite/0243-Moz-POST-FB.test @@ -38,7 +38,7 @@ SELECT calendar_item.rrule, calendar_item.status, INNER JOIN caldav_data USING (collection_id) INNER JOIN calendar_item USING(dav_id) LEFT JOIN timezones ON (tz_id=tzid) -WHERE lower(usr.email) = 'user1@example.net' +WHERE lower(usr.username) = 'user1' AND collection.is_calendar AND collection.schedule_transp = 'opaque' AND rrule_event_overlaps( dtstart, dtend, rrule, '20081020T110000Z', '20081105T110000Z' ) AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) diff --git a/testing/tests/regression-suite/0244-Moz-POST-FB.test b/testing/tests/regression-suite/0244-Moz-POST-FB.test index 3d7aa2b7..ec018593 100644 --- a/testing/tests/regression-suite/0244-Moz-POST-FB.test +++ b/testing/tests/regression-suite/0244-Moz-POST-FB.test @@ -38,7 +38,7 @@ SELECT calendar_item.rrule, FROM usr INNER JOIN collection USING (user_no) INNER JOIN caldav_data USING (collection_id) INNER JOIN calendar_item USING(dav_id) -WHERE lower(usr.email) = 'user2@example.net' +WHERE lower(usr.username) = 'user2' AND collection.is_calendar AND rrule_event_overlaps( dtstart, dtend, rrule, '20081020T110000Z', '20081105T110000Z' ) AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) diff --git a/testing/tests/regression-suite/0836-freebusy.test b/testing/tests/regression-suite/0836-freebusy.test index de525568..f49eee52 100644 --- a/testing/tests/regression-suite/0836-freebusy.test +++ b/testing/tests/regression-suite/0836-freebusy.test @@ -21,7 +21,7 @@ SELECT calendar_item.rrule, calendar_item.status, INNER JOIN caldav_data USING (collection_id) INNER JOIN calendar_item USING(dav_id) LEFT JOIN timezones ON (tz_id=tzid) -WHERE usr.email = 'user1@example.net' +WHERE usr.username = 'user1' AND collection.is_calendar AND collection.schedule_transp = 'opaque' AND rrule_event_overlaps( dtstart, dtend, rrule, '20061001T000000Z', '20070630T235959Z' ) AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) diff --git a/testing/tests/regression-suite/0837-freebusy.test b/testing/tests/regression-suite/0837-freebusy.test index aa73a89c..86d9b7ba 100644 --- a/testing/tests/regression-suite/0837-freebusy.test +++ b/testing/tests/regression-suite/0837-freebusy.test @@ -21,7 +21,7 @@ SELECT calendar_item.rrule, calendar_item.status, INNER JOIN caldav_data USING (collection_id) INNER JOIN calendar_item USING(dav_id) LEFT JOIN timezones ON (tz_id=tzid) -WHERE usr.email = 'user1@example.net' +WHERE usr.username = 'user1' AND collection.is_calendar AND collection.schedule_transp = 'opaque' AND rrule_event_overlaps( dtstart, dtend, rrule, '20061001T000000Z', '20070630T235959Z' ) AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) diff --git a/testing/tests/regression-suite/0963-POST-freebusy-private.test b/testing/tests/regression-suite/0963-POST-freebusy-private.test index 4bd69b96..063bb409 100644 --- a/testing/tests/regression-suite/0963-POST-freebusy-private.test +++ b/testing/tests/regression-suite/0963-POST-freebusy-private.test @@ -44,7 +44,7 @@ SELECT calendar_item.rrule, FROM usr INNER JOIN collection USING (user_no) INNER JOIN caldav_data USING (collection_id) INNER JOIN calendar_item USING(dav_id) -WHERE lower(usr.email) = 'user1@example.net' +WHERE lower(usr.username) = 'user1' AND collection.is_calendar AND rrule_event_overlaps( dtstart, dtend, rrule, '20080730T110000Z', '20080803T110000Z' ) AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' ) diff --git a/testing/tests/regression-suite/Really-Upgrade-Database.result b/testing/tests/regression-suite/Really-Upgrade-Database.result index 299acd5c..9bdec045 100644 --- a/testing/tests/regression-suite/Really-Upgrade-Database.result +++ b/testing/tests/regression-suite/Really-Upgrade-Database.result @@ -1,4 +1,4 @@ -The database is version XX currently at revision 1.3.3. +The database is version XX currently at revision 1.3.4. No patches were applied. Supported locales updated. Updated view: dav_principal.sql applied. diff --git a/testing/tests/regression-suite/sample-data.sql b/testing/tests/regression-suite/sample-data.sql index 89ed56b6..fcbfa6cc 100644 --- a/testing/tests/regression-suite/sample-data.sql +++ b/testing/tests/regression-suite/sample-data.sql @@ -1,44 +1,78 @@ -- Some sample data to prime the database... -- base-data.sql should be processed before this -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 2, TRUE, current_date, current_date, 'andrew', '**x', 'Andrew McMillan', 'andrew@catalyst.net.nz' ); +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 2, TRUE, current_date, current_date, 'andrew', '**x', 'Andrew McMillan' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES (2, 'andrew@catalyst.net.nz' ); INSERT INTO role_member (user_no, role_no) VALUES( 2, 1); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 10, TRUE, current_date, current_date, 'user1', '**user1', 'User 1', 'user1@example.net' ); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 11, TRUE, current_date, current_date, 'user2', '**user2', 'User 2', 'user2@example.net' ); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 12, TRUE, current_date, current_date, 'user3', '**user3', 'User 3', 'user3@example.net' ); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 13, TRUE, current_date, current_date, 'user4', '**user4', 'User 4', 'user4@example.net' ); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 14, TRUE, current_date, current_date, 'user5', '**user5', 'User 5', 'user5@example.net' ); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 15, TRUE, current_date, current_date, 'User Six', '**user6', 'User 6', 'user6@example.net' ); +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 10, TRUE, current_date, current_date, 'user1', '**user1', 'User 1'); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 10, 'user1@example.net' ); +INSERT INTO usr_emails ( user_no, email, main ) + VALUES( 10, 'user1+second@example.net', 'f' ); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 20, TRUE, current_date, current_date, 'manager1', '**manager1', 'Manager 1', 'manager1@example.net' ); +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 11, TRUE, current_date, current_date, 'user2', '**user2', 'User 2'); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 11, 'user2@example.net' ); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 30, TRUE, current_date, current_date, 'assistant1', '**assistant1', 'Assistant 1', 'assistant1@example.net' ); +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 12, TRUE, current_date, current_date, 'user3', '**user3', 'User 3' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 12, 'user3@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 13, TRUE, current_date, current_date, 'user4', '**user4', 'User 4' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 13, 'user4@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 14, TRUE, current_date, current_date, 'user5', '**user5', 'User 5' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 14, 'user5@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 15, TRUE, current_date, current_date, 'User Six', '**user6', 'User 6' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 15, 'user6@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 20, TRUE, current_date, current_date, 'manager1', '**manager1', 'Manager 1' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 20, 'manager1@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 30, TRUE, current_date, current_date, 'assistant1', '**assistant1', 'Assistant 1' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 30, 'assistant1@example.net' ); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 100, TRUE, current_date, current_date, 'resource1', '*salt*unpossible', 'Resource 1', 'resource1@example.net' ); +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 100, TRUE, current_date, current_date, 'resource1', '*salt*unpossible', 'Resource 1' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 100, 'resource1@example.net' ); INSERT INTO role_member (user_no, role_no) VALUES( 100, 4); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 101, TRUE, current_date, current_date, 'resource2', '*salt*unpossible', 'Resource 2', 'resource2@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 101, TRUE, current_date, current_date, 'resource2', '*salt*unpossible', 'Resource 2' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 101, 'resource2@example.net' ); INSERT INTO role_member (user_no, role_no) VALUES( 101, 4); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 200, TRUE, current_date, current_date, 'resmgr1', '*salt*unpossible', 'Resource Managers', 'resource-managers@example.net' ); +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 200, TRUE, current_date, current_date, 'resmgr1', '*salt*unpossible', 'Resource Managers' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 200, 'resource-managers@example.net' ); INSERT INTO role_member (user_no, role_no) VALUES( 200, 2); -INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) - VALUES( 300, TRUE, current_date, current_date, 'teamclient1', '*salt*unpossible', 'Team for Client1', 'team-client1@example.net' ); +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname ) + VALUES( 300, TRUE, current_date, current_date, 'teamclient1', '*salt*unpossible', 'Team for Client1' ); +INSERT INTO usr_emails ( user_no, email ) + VALUES ( 300, 'team-client1@example.net' ); INSERT INTO role_member (user_no, role_no) VALUES( 300, 2); SELECT setval('usr_user_no_seq', 1000); @@ -46,6 +80,7 @@ SELECT setval('dav_id_seq', 1000); UPDATE usr SET joined = '2009-06-01', updated = '2009-06-02'; + INSERT INTO collection (user_no, parent_container, dav_name, dav_etag, dav_displayname, is_calendar, created, modified, public_events_only, publicly_readable, collection_id, resourcetypes )