diff --git a/testing/tests/carddav/2019-PUT-vcard.result b/testing/tests/carddav/2019-PUT-vcard.result index 379502dc..7cf7bd7d 100644 --- a/testing/tests/carddav/2019-PUT-vcard.result +++ b/testing/tests/carddav/2019-PUT-vcard.result @@ -56,9 +56,9 @@ Content-Type: text/plain; charset="utf-8" email: >raettchen@gmail.bar< type: >NULL< - email: >joerg@factordesign.foo< - type: >NULL< - email: >joerg.rossdeutscher@factordesign.foo< type: >NULL< + email: >joerg@factordesign.foo< + type: >NULL< + diff --git a/testing/tests/carddav/2019-PUT-vcard.test b/testing/tests/carddav/2019-PUT-vcard.test index f218bc30..dcc4e1cf 100644 --- a/testing/tests/carddav/2019-PUT-vcard.test +++ b/testing/tests/carddav/2019-PUT-vcard.test @@ -44,7 +44,7 @@ SELECT FROM caldav_data LEFT JOIN addressbook_address_adr USING(dav_id) WHERE caldav_data.dav_name ~ '/user1/addressbook/Jörg_Test-Roßdeutscher_2_0.vcf' - ORDER BY dav_id, property + ORDER BY dav_id, property, 1, 2 ENDQUERY QUERY @@ -53,7 +53,7 @@ SELECT FROM caldav_data LEFT JOIN addressbook_address_tel USING(dav_id) WHERE caldav_data.dav_name ~ '/user1/addressbook/Jörg_Test-Roßdeutscher_2_0.vcf' - ORDER BY dav_id, property + ORDER BY dav_id, property, 1, 2 ENDQUERY QUERY @@ -62,7 +62,7 @@ SELECT FROM caldav_data LEFT JOIN addressbook_address_email USING(dav_id) WHERE caldav_data.dav_name ~ '/user1/addressbook/Jörg_Test-Roßdeutscher_2_0.vcf' - ORDER BY dav_id, property + ORDER BY dav_id, property, 1, 2 ENDQUERY diff --git a/testing/tests/carddav/2020-PUT-vcard.result b/testing/tests/carddav/2020-PUT-vcard.result index 55f4f88a..31c423e3 100644 --- a/testing/tests/carddav/2020-PUT-vcard.result +++ b/testing/tests/carddav/2020-PUT-vcard.result @@ -40,6 +40,9 @@ Content-Type: text/plain; charset="utf-8" tel: >040 999999432571-43< type: >pref< + email: >joerg.rossdeutscher@factordesign.foo< + type: >pref< + email: >joerg.rossdeutscher@gesindel.foo< type: >HOME< @@ -49,6 +52,3 @@ Content-Type: text/plain; charset="utf-8" email: >joerg@factordesign.foo< type: >WORK< - email: >joerg.rossdeutscher@factordesign.foo< - type: >pref< - diff --git a/testing/tests/carddav/2020-PUT-vcard.test b/testing/tests/carddav/2020-PUT-vcard.test index 84326627..a6b1d4af 100644 --- a/testing/tests/carddav/2020-PUT-vcard.test +++ b/testing/tests/carddav/2020-PUT-vcard.test @@ -49,7 +49,7 @@ SELECT FROM caldav_data LEFT JOIN addressbook_address_adr USING(dav_id) WHERE caldav_data.dav_name ~ '/user1/addressbook/Jörg_Test-Roßdeutscher_3_0.vcf' - ORDER BY dav_id, property + ORDER BY dav_id, property, 1, 2 ENDQUERY QUERY @@ -58,7 +58,7 @@ SELECT FROM caldav_data LEFT JOIN addressbook_address_tel USING(dav_id) WHERE caldav_data.dav_name ~ '/user1/addressbook/Jörg_Test-Roßdeutscher_3_0.vcf' - ORDER BY dav_id, property + ORDER BY dav_id, property, 1, 2 ENDQUERY QUERY @@ -67,7 +67,7 @@ SELECT FROM caldav_data LEFT JOIN addressbook_address_email USING(dav_id) WHERE caldav_data.dav_name ~ '/user1/addressbook/Jörg_Test-Roßdeutscher_3_0.vcf' - ORDER BY dav_id, property + ORDER BY dav_id, property, 1, 2 ENDQUERY