NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit42be2c7

committed

Adjust citext to make use of the new ability to declare its type category:

by putting it into the standard string category, we cause casts from citextto text to be recognized as "preferred" casts. This eliminates the needfor creation of alias functions and operators that only serve to preventambiguous-function errors; get rid of the ones that were in the originalcommit.

1 parentbac3e83 commit42be2c7Copy full SHA for 42be2c7

File tree

2 files changed

-39

lines changed

contrib/citext
- citext.sql.in
- uninstall_citext.sql

2 files changed

-39

lines changed

`‎contrib/citext/citext.sql.in`

Lines changed: 5 additions & 33 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/contrib/citext/citext.sql.in,v 1.1 2008/07/29 18:31:20 tgl Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/contrib/citext/citext.sql.in,v 1.2 2008/07/30 17:08:52 tgl Exp $ */`
`2`	`2`
`3`	`3`	`-- Adjust this setting to control where the objects get created.`
`4`	`4`	`SET search_path = public;`
`@@ -49,7 +49,10 @@ CREATE TYPE citext (`
`49`	`49`	`RECEIVE = citextrecv,`
`50`	`50`	`SEND = citextsend,`
`51`	`51`	`INTERNALLENGTH = VARIABLE,`
`52`		`- STORAGE = extended`
	`52`	`+ STORAGE = extended,`
	`53`	`+ -- make it a non-preferred member of string type category`
	`54`	`+ CATEGORY = 'S',`
	`55`	`+ PREFERRED = false`
`53`	`56`	`);`
`54`	`57`
`55`	`58`	`--`
`@@ -106,12 +109,6 @@ RETURNS bool`
`106`	`109`	`AS 'MODULE_PATHNAME'`
`107`	`110`	`LANGUAGE C IMMUTABLE STRICT;`
`108`	`111`
`109`		`--- We overload \|\| just to preserve "citext-ness" of the result.`
`110`		`-CREATE OR REPLACE FUNCTION textcat(citext, citext)`
`111`		`-RETURNS citext`
`112`		`-AS 'textcat'`
`113`		`-LANGUAGE 'internal' IMMUTABLE STRICT;`
`114`		`-`
`115`	`112`	`--`
`116`	`113`	`-- Operators.`
`117`	`114`	`--`
`@@ -178,12 +175,6 @@ CREATE OPERATOR > (`
`178`	`175`	`JOIN = scalargtjoinsel`
`179`	`176`	`);`
`180`	`177`
`181`		`-CREATE OPERATOR \|\| (`
`182`		`- LEFTARG = CITEXT,`
`183`		`- RIGHTARG = CITEXT,`
`184`		`- PROCEDURE = textcat`
`185`		`-);`
`186`		`-`
`187`	`178`	`--`
`188`	`179`	`-- Support functions for indexing.`
`189`	`180`	`--`
`@@ -246,25 +237,6 @@ CREATE AGGREGATE max(citext) (`
`246`	`237`	`SORTOP = >`
`247`	`238`	`);`
`248`	`239`
`249`		`---`
`250`		`--- Miscellaneous functions`
`251`		`--- These exist to preserve the "citext-ness" of the input.`
`252`		`---`
`253`		`-`
`254`		`-CREATE OR REPLACE FUNCTION lower(citext)`
`255`		`-RETURNS citext AS 'lower'`
`256`		`-LANGUAGE 'internal' IMMUTABLE STRICT;`
`257`		`-`
`258`		`-CREATE OR REPLACE FUNCTION upper(citext)`
`259`		`-RETURNS citext AS 'upper'`
`260`		`-LANGUAGE 'internal' IMMUTABLE STRICT;`
`261`		`-`
`262`		`--- needed to avoid "function is not unique" errors`
`263`		`--- XXX find a better way to deal with this...`
`264`		`-CREATE FUNCTION quote_literal(citext)`
`265`		`-RETURNS text AS 'quote_literal'`
`266`		`-LANGUAGE 'internal' IMMUTABLE STRICT;`
`267`		`-`
`268`	`240`	`--`
`269`	`241`	`-- CITEXT pattern matching.`
`270`	`242`	`--`

`‎contrib/citext/uninstall_citext.sql`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/contrib/citext/uninstall_citext.sql,v 1.1 2008/07/29 18:31:20 tgl Exp $*/`
	`1`	`+/* $PostgreSQL: pgsql/contrib/citext/uninstall_citext.sql,v 1.2 2008/07/30 17:08:52 tgl Exp $*/`
`2`	`2`
`3`	`3`	`-- Adjust this setting to control where the objects get dropped.`
`4`	`4`	`SET search_path= public;`
`@@ -15,7 +15,6 @@ DROP OPERATOR < (citext, citext);`
`15`	`15`	`DROPOPERATOR<= (citext, citext);`
`16`	`16`	`DROPOPERATOR>= (citext, citext);`
`17`	`17`	`DROPOPERATOR> (citext, citext);`
`18`		`-DROPOPERATOR\|\| (citext, citext);`
`19`	`18`
`20`	`19`	`DROPOPERATOR ~ (citext, citext);`
`21`	`20`	`DROPOPERATOR ~* (citext, citext);`
`@@ -49,14 +48,10 @@ DROP FUNCTION citext_lt(citext, citext);`
`49`	`48`	`DROPFUNCTION citext_le(citext, citext);`
`50`	`49`	`DROPFUNCTION citext_gt(citext, citext);`
`51`	`50`	`DROPFUNCTION citext_ge(citext, citext);`
`52`		`-DROPFUNCTION textcat(citext, citext);`
`53`	`51`	`DROPFUNCTION citext_cmp(citext, citext);`
`54`	`52`	`DROPFUNCTION citext_hash(citext);`
`55`	`53`	`DROPFUNCTION citext_smaller(citext, citext);`
`56`	`54`	`DROPFUNCTION citext_larger(citext, citext);`
`57`		`-DROPFUNCTIONlower(citext);`
`58`		`-DROPFUNCTIONupper(citext);`
`59`		`-DROPFUNCTION quote_literal(citext);`
`60`	`55`	`DROPFUNCTION texticlike(citext, citext);`
`61`	`56`	`DROPFUNCTION texticnlike(citext, citext);`
`62`	`57`	`DROPFUNCTION texticregexeq(citext, citext);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit42be2c7

File tree

2 files changed

2 files changed

`‎contrib/citext/citext.sql.in`

`‎contrib/citext/uninstall_citext.sql`

0 commit comments