mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

varstr_cmp and any comparison function that piggybacks on it can return

Browse Source 
any negative or positive number, not just -1 or 1. Fix comment on
varstr_cmp and citext test case accordingly.

As pointed out by Zdenek Kotala, and buildfarm member gothic moth.
This commit is contained in:
Heikki Linnakangas 2009-04-23 07:19:09 +00:00
parent 8d4f2ecd41
commit 283939a321
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/citext/expected/citext.out
View File

@ -213,10 +213,10 @@ SELECT citext_cmp('AARDVARK'::citext, 'AARDVARK'::citext) AS zero;
0
(1 row)
SELECT citext_cmp('B'::citext, 'a'::citext) AS one;
one
-----
1
SELECT citext_cmp('B'::citext, 'a'::citext) > 0 AS true;
true
------
t
(1 row)
-- Do some tests using a table and index.

8
contrib/citext/expected/citext_1.out
View File

@ -213,10 +213,10 @@ SELECT citext_cmp('AARDVARK'::citext, 'AARDVARK'::citext) AS zero;
0
(1 row)
SELECT citext_cmp('B'::citext, 'a'::citext) AS one;
one
-----
1
SELECT citext_cmp('B'::citext, 'a'::citext) > 0 AS true;
true
------
t
(1 row)
-- Do some tests using a table and index.

2
contrib/citext/sql/citext.sql
View File

@ -90,7 +90,7 @@ SELECT 'aardvark'::citext = 'aardVark'::citext AS t;
SELECT citext_cmp('aardvark'::citext, 'aardvark'::citext) AS zero;
SELECT citext_cmp('aardvark'::citext, 'aardVark'::citext) AS zero;
SELECT citext_cmp('AARDVARK'::citext, 'AARDVARK'::citext) AS zero;
SELECT citext_cmp('B'::citext, 'a'::citext) AS one;
SELECT citext_cmp('B'::citext, 'a'::citext) > 0 AS true;
-- Do some tests using a table and index.

5
src/backend/utils/adt/varlena.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.169 2009/01/01 17:23:50 momjian Exp $
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.170 2009/04/23 07:19:09 heikki Exp $
*
*-------------------------------------------------------------------------
*/
@ -1138,7 +1138,8 @@ text_position_cleanup(TextPositionState *state)
* Comparison function for text strings with given lengths.
* Includes locale support, but must copy strings to temporary memory
* to allow null-termination for inputs to strcoll().
* Returns -1, 0 or 1
* Returns an integer less than, equal to, or greater than zero, indicating
* whether arg1 is less than, equal to, or greater than arg2.
*/
int
varstr_cmp(char *arg1, int len1, char *arg2, int len2)