From: Pierangelo Masarati Date: Wed, 25 Aug 2004 12:14:07 +0000 (+0000) Subject: "order by" plus -S "" seems to work... X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~645 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d9534e5e0d193bb81837f09af2b889ba6339491f;p=openldap "order by" plus -S "" seems to work... --- diff --git a/tests/data/sql-read.out b/tests/data/sql-read.out index 5390cd42e5..bb164bc7c3 100644 --- a/tests/data/sql-read.out +++ b/tests/data/sql-read.out @@ -27,8 +27,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 dn: cn=Torvlobnor Puzdoy,dc=example,dc=com objectClass: inetOrgPerson @@ -49,8 +49,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 # Testing substrings initial search... dn: cn=Mitya Kovalev,dc=example,dc=com @@ -60,8 +60,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 # Testing substrings any search... dn: cn=Mitya Kovalev,dc=example,dc=com @@ -71,8 +71,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 # Testing substrings final search... dn: cn=Mitya Kovalev,dc=example,dc=com @@ -82,8 +82,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 # Testing approx search... dn: cn=Mitya Kovalev,dc=example,dc=com @@ -93,8 +93,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 # Testing extensible filter search... dn: cn=Mitya Kovalev,dc=example,dc=com @@ -104,8 +104,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 # Testing search for telephoneNumber... dn: cn=Mitya Kovalev,dc=example,dc=com @@ -115,8 +115,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 # Testing AND search... dn: cn=Mitya Kovalev,dc=example,dc=com @@ -126,8 +126,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 # Testing AND search on objectClass... dn: dc=example,dc=com @@ -144,8 +144,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 # Testing OR search on objectClass... dn: documentTitle=book1,dc=example,dc=com @@ -225,8 +225,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 dn: cn=Torvlobnor Puzdoy,dc=example,dc=com objectClass: inetOrgPerson @@ -253,8 +253,8 @@ sn: Kovalev seeAlso: documentTitle=book1,dc=example,dc=com seeAlso: documentTitle=book2,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 telephoneNumber: 222-3234 +telephoneNumber: 332-2334 dn: cn=Torvlobnor Puzdoy,dc=example,dc=com objectClass: inetOrgPerson diff --git a/tests/data/sql-write.out b/tests/data/sql-write.out index 9afb5868fa..3e89e3fb15 100644 --- a/tests/data/sql-write.out +++ b/tests/data/sql-write.out @@ -1,33 +1,18 @@ -dn: documentTitle=War and Peace,dc=example,dc=com -objectClass: document -description: Historical novel -documentTitle: War and Peace -documentAuthor: cn=Lev Tolstoij,dc=subnet,dc=example,dc=com -documentIdentifier: document 3 - -dn: documentTitle=Renamed Book,dc=example,dc=com -objectClass: document -description: abstract2 -documentTitle: Renamed Book -documentAuthor: cn=Mitya Kovalev,dc=example,dc=com -documentAuthor: cn=Lev Tolstoij,dc=subnet,dc=example,dc=com -documentIdentifier: document 2 - dn: dc=example,dc=com objectClass: organization objectClass: dcObject o: Example dc: example -dn: dc=subnet,dc=example,dc=com -objectClass: organization -objectClass: dcObject -o: SubNet -dc: subnet - -dn: o=Renamed Org,dc=example,dc=com -objectClass: organization -o: Renamed Org +dn: cn=Lev Tolstoij,dc=subnet,dc=example,dc=com +objectClass: inetOrgPerson +cn: Lev Tolstoij +sn: Tolstoij +seeAlso: documentTitle=Renamed Book,dc=example,dc=com +seeAlso: documentTitle=War and Peace,dc=example,dc=com +givenName: Lev +telephoneNumber: +39 02 XXXX ZZZZ +telephoneNumber: +39 333 ZZZ 1234 dn: cn=Mitya Kovalev,dc=example,dc=com objectClass: inetOrgPerson @@ -35,9 +20,21 @@ cn: Mitya Kovalev sn: Kovalev seeAlso: documentTitle=Renamed Book,dc=example,dc=com givenName: Mitya -telephoneNumber: 332-2334 -telephoneNumber: 222-3234 telephoneNumber: +1 800 123 4567 +telephoneNumber: 222-3234 +telephoneNumber: 332-2334 + +dn: documentTitle=Renamed Book,dc=example,dc=com +objectClass: document +description: abstract2 +documentTitle: Renamed Book +documentAuthor: cn=Lev Tolstoij,dc=subnet,dc=example,dc=com +documentAuthor: cn=Mitya Kovalev,dc=example,dc=com +documentIdentifier: document 2 + +dn: o=Renamed Org,dc=example,dc=com +objectClass: organization +o: Renamed Org dn: cn=Some One,dc=example,dc=com objectClass: inetOrgPerson @@ -46,19 +43,22 @@ cn: Some One sn: One givenName: Some +dn: dc=subnet,dc=example,dc=com +objectClass: organization +objectClass: dcObject +o: SubNet +dc: subnet + dn: cn=SubNet User,dc=subnet,dc=example,dc=com objectClass: inetOrgPerson cn: SubNet User sn: User givenName: SubNet -dn: cn=Lev Tolstoij,dc=subnet,dc=example,dc=com -objectClass: inetOrgPerson -cn: Lev Tolstoij -sn: Tolstoij -seeAlso: documentTitle=Renamed Book,dc=example,dc=com -seeAlso: documentTitle=War and Peace,dc=example,dc=com -givenName: Lev -telephoneNumber: +39 02 XXXX ZZZZ -telephoneNumber: +39 333 ZZZ 1234 +dn: documentTitle=War and Peace,dc=example,dc=com +objectClass: document +description: Historical novel +documentTitle: War and Peace +documentAuthor: cn=Lev Tolstoij,dc=subnet,dc=example,dc=com +documentIdentifier: document 3