NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitee30373

committed

Just some fixups to a couple contrib directories I was trying out.

. replace CREATE OR REPLACE AGGREGATE with a separate DROP and CREATE. add DROP for all CREATE OPERATORs. use IMMUTABLE and STRICT instead of WITH (isStrict). add IMMUTABLE and STRICT to int_array_aggregate's accumulator functionGregory Stark

1 parent900fa3d commitee30373Copy full SHA for ee30373

File tree

2 files changed

+65

-34

lines changed

contrib
- array
  - array_iterator.sql.in
- intagg
  - int_aggregate.sql.in

2 files changed

+65

-34

lines changed

`‎contrib/array/array_iterator.sql.in`

Lines changed: 60 additions & 30 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,41 +11,45 @@ SET autocommit TO 'on';`
`11`	`11`	`CREATE OR REPLACE FUNCTION array_texteq(_text, text)`
`12`	`12`	`RETURNS bool`
`13`	`13`	`AS 'MODULE_PATHNAME'`
`14`		`-LANGUAGE 'C'WITH (isStrict);`
	`14`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`15`	`15`
`16`	`16`	`CREATE OR REPLACE FUNCTION array_all_texteq(_text, text)`
`17`	`17`	`RETURNS bool`
`18`	`18`	`AS 'MODULE_PATHNAME'`
`19`		`-LANGUAGE 'C'WITH (isStrict);`
	`19`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`20`	`20`
`21`	`21`	`CREATE OR REPLACE FUNCTION array_textregexeq(_text, text)`
`22`	`22`	`RETURNS bool`
`23`	`23`	`AS 'MODULE_PATHNAME'`
`24`		`-LANGUAGE 'C'WITH (isStrict);`
	`24`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`25`	`25`
`26`	`26`	`CREATE OR REPLACE FUNCTION array_all_textregexeq(_text, text)`
`27`	`27`	`RETURNS bool`
`28`	`28`	`AS 'MODULE_PATHNAME'`
`29`		`-LANGUAGE 'C'WITH (isStrict);`
	`29`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`30`	`30`
	`31`	`+DROP OPERATOR *=(_text,text);`
`31`	`32`	`CREATE OPERATOR *= (`
`32`	`33`	`LEFTARG=_text,`
`33`	`34`	`RIGHTARG=text,`
`34`	`35`	`PROCEDURE=array_texteq`
`35`	`36`	`);`
`36`	`37`
	`38`	`+DROP OPERATOR **=(_text,text);`
`37`	`39`	`CREATE OPERATOR **= (`
`38`	`40`	`LEFTARG=_text,`
`39`	`41`	`RIGHTARG=text,`
`40`	`42`	`PROCEDURE=array_all_texteq`
`41`	`43`	`);`
`42`	`44`
	`45`	`+DROP OPERATOR *~(_text,text);`
`43`	`46`	`CREATE OPERATOR *~ (`
`44`	`47`	`LEFTARG=_text,`
`45`	`48`	`RIGHTARG=text,`
`46`	`49`	`PROCEDURE=array_textregexeq`
`47`	`50`	`);`
`48`	`51`
	`52`	`+DROP OPERATOR **~(_text,text);`
`49`	`53`	`CREATE OPERATOR **~ (`
`50`	`54`	`LEFTARG=_text,`
`51`	`55`	`RIGHTARG=text,`
`@@ -60,41 +64,45 @@ CREATE OPERATOR **~ (`
`60`	`64`	`CREATE OR REPLACE FUNCTION array_varchareq(_varchar, varchar)`
`61`	`65`	`RETURNS bool`
`62`	`66`	`AS 'MODULE_PATHNAME'`
`63`		`-LANGUAGE 'C'WITH (isStrict);`
	`67`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`64`	`68`
`65`	`69`	`CREATE OR REPLACE FUNCTION array_all_varchareq(_varchar, varchar)`
`66`	`70`	`RETURNS bool`
`67`	`71`	`AS 'MODULE_PATHNAME'`
`68`		`-LANGUAGE 'C'WITH (isStrict);`
	`72`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`69`	`73`
`70`	`74`	`CREATE OR REPLACE FUNCTION array_varcharregexeq(_varchar, varchar)`
`71`	`75`	`RETURNS bool`
`72`	`76`	`AS 'MODULE_PATHNAME'`
`73`		`-LANGUAGE 'C'WITH (isStrict);`
	`77`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`74`	`78`
`75`	`79`	`CREATE OR REPLACE FUNCTION array_all_varcharregexeq(_varchar, varchar)`
`76`	`80`	`RETURNS bool`
`77`	`81`	`AS 'MODULE_PATHNAME'`
`78`		`-LANGUAGE 'C'WITH (isStrict);`
	`82`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`79`	`83`
	`84`	`+DROP OPERATOR *=(_varchar,"varchar");`
`80`	`85`	`CREATE OPERATOR *= (`
`81`	`86`	`LEFTARG=_varchar,`
`82`	`87`	`RIGHTARG="varchar",`
`83`	`88`	`PROCEDURE=array_varchareq`
`84`	`89`	`);`
`85`	`90`
	`91`	`+DROP OPERATOR **=(_varchar,"varchar");`
`86`	`92`	`CREATE OPERATOR **= (`
`87`	`93`	`LEFTARG=_varchar,`
`88`	`94`	`RIGHTARG="varchar",`
`89`	`95`	`PROCEDURE=array_all_varchareq`
`90`	`96`	`);`
`91`	`97`
	`98`	`+DROP OPERATOR *~(_varchar,"varchar");`
`92`	`99`	`CREATE OPERATOR *~ (`
`93`	`100`	`LEFTARG=_varchar,`
`94`	`101`	`RIGHTARG="varchar",`
`95`	`102`	`PROCEDURE=array_varcharregexeq`
`96`	`103`	`);`
`97`	`104`
	`105`	`+DROP OPERATOR **~(_varchar,"varchar");`
`98`	`106`	`CREATE OPERATOR **~ (`
`99`	`107`	`LEFTARG=_varchar,`
`100`	`108`	`RIGHTARG="varchar",`
`@@ -107,41 +115,45 @@ CREATE OPERATOR **~ (`
`107`	`115`	`CREATE OR REPLACE FUNCTION array_bpchareq(_bpchar, bpchar)`
`108`	`116`	`RETURNS bool`
`109`	`117`	`AS 'MODULE_PATHNAME'`
`110`		`-LANGUAGE 'C'WITH (isStrict);`
	`118`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`111`	`119`
`112`	`120`	`CREATE OR REPLACE FUNCTION array_all_bpchareq(_bpchar, bpchar)`
`113`	`121`	`RETURNS bool`
`114`	`122`	`AS 'MODULE_PATHNAME'`
`115`		`-LANGUAGE 'C'WITH (isStrict);`
	`123`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`116`	`124`
`117`	`125`	`CREATE OR REPLACE FUNCTION array_bpcharregexeq(_bpchar, bpchar)`
`118`	`126`	`RETURNS bool`
`119`	`127`	`AS 'MODULE_PATHNAME'`
`120`		`-LANGUAGE 'C'WITH (isStrict);`
	`128`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`121`	`129`
`122`	`130`	`CREATE OR REPLACE FUNCTION array_all_bpcharregexeq(_bpchar, bpchar)`
`123`	`131`	`RETURNS bool`
`124`	`132`	`AS 'MODULE_PATHNAME'`
`125`		`-LANGUAGE 'C'WITH (isStrict);`
	`133`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`126`	`134`
	`135`	`+DROP OPERATOR *=(_bpchar,bpchar);`
`127`	`136`	`CREATE OPERATOR *= (`
`128`	`137`	`LEFTARG=_bpchar,`
`129`	`138`	`RIGHTARG=bpchar,`
`130`	`139`	`PROCEDURE=array_bpchareq`
`131`	`140`	`);`
`132`	`141`
	`142`	`+DROP OPERATOR **=(_bpchar,bpchar);`
`133`	`143`	`CREATE OPERATOR **= (`
`134`	`144`	`LEFTARG=_bpchar,`
`135`	`145`	`RIGHTARG=bpchar,`
`136`	`146`	`PROCEDURE=array_all_bpchareq`
`137`	`147`	`);`
`138`	`148`
	`149`	`+DROP OPERATOR *~(_bpchar,bpchar);`
`139`	`150`	`CREATE OPERATOR *~ (`
`140`	`151`	`LEFTARG=_bpchar,`
`141`	`152`	`RIGHTARG=bpchar,`
`142`	`153`	`PROCEDURE=array_bpcharregexeq`
`143`	`154`	`);`
`144`	`155`
	`156`	`+DROP OPERATOR **~(_bpchar,bpchar);`
`145`	`157`	`CREATE OPERATOR **~ (`
`146`	`158`	`LEFTARG=_bpchar,`
`147`	`159`	`RIGHTARG=bpchar,`
`@@ -154,129 +166,141 @@ CREATE OPERATOR **~ (`
`154`	`166`	`CREATE OR REPLACE FUNCTION array_int4eq(_int4, int4)`
`155`	`167`	`RETURNS bool`
`156`	`168`	`AS 'MODULE_PATHNAME'`
`157`		`-LANGUAGE 'C'WITH (isStrict);`
	`169`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`158`	`170`
`159`	`171`	`CREATE OR REPLACE FUNCTION array_all_int4eq(_int4, int4)`
`160`	`172`	`RETURNS bool`
`161`	`173`	`AS 'MODULE_PATHNAME'`
`162`		`-LANGUAGE 'C'WITH (isStrict);`
	`174`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`163`	`175`
`164`	`176`	`CREATE OR REPLACE FUNCTION array_int4ne(_int4, int4)`
`165`	`177`	`RETURNS bool`
`166`	`178`	`AS 'MODULE_PATHNAME'`
`167`		`-LANGUAGE 'C'WITH (isStrict);`
	`179`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`168`	`180`
`169`	`181`	`CREATE OR REPLACE FUNCTION array_all_int4ne(_int4, int4)`
`170`	`182`	`RETURNS bool`
`171`	`183`	`AS 'MODULE_PATHNAME'`
`172`		`-LANGUAGE 'C'WITH (isStrict);`
	`184`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`173`	`185`
`174`	`186`	`CREATE OR REPLACE FUNCTION array_int4gt(_int4, int4)`
`175`	`187`	`RETURNS bool`
`176`	`188`	`AS 'MODULE_PATHNAME'`
`177`		`-LANGUAGE 'C'WITH (isStrict);`
	`189`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`178`	`190`
`179`	`191`	`CREATE OR REPLACE FUNCTION array_all_int4gt(_int4, int4)`
`180`	`192`	`RETURNS bool`
`181`	`193`	`AS 'MODULE_PATHNAME'`
`182`		`-LANGUAGE 'C'WITH (isStrict);`
	`194`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`183`	`195`
`184`	`196`	`CREATE OR REPLACE FUNCTION array_int4ge(_int4, int4)`
`185`	`197`	`RETURNS bool`
`186`	`198`	`AS 'MODULE_PATHNAME'`
`187`		`-LANGUAGE 'C'WITH (isStrict);`
	`199`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`188`	`200`
`189`	`201`	`CREATE OR REPLACE FUNCTION array_all_int4ge(_int4, int4)`
`190`	`202`	`RETURNS bool`
`191`	`203`	`AS 'MODULE_PATHNAME'`
`192`		`-LANGUAGE 'C'WITH (isStrict);`
	`204`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`193`	`205`
`194`	`206`	`CREATE OR REPLACE FUNCTION array_int4lt(_int4, int4)`
`195`	`207`	`RETURNS bool`
`196`	`208`	`AS 'MODULE_PATHNAME'`
`197`		`-LANGUAGE 'C'WITH (isStrict);`
	`209`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`198`	`210`
`199`	`211`	`CREATE OR REPLACE FUNCTION array_all_int4lt(_int4, int4)`
`200`	`212`	`RETURNS bool`
`201`	`213`	`AS 'MODULE_PATHNAME'`
`202`		`-LANGUAGE 'C'WITH (isStrict);`
	`214`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`203`	`215`
`204`	`216`	`CREATE OR REPLACE FUNCTION array_int4le(_int4, int4)`
`205`	`217`	`RETURNS bool`
`206`	`218`	`AS 'MODULE_PATHNAME'`
`207`		`-LANGUAGE 'C'WITH (isStrict);`
	`219`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`208`	`220`
`209`	`221`	`CREATE OR REPLACE FUNCTION array_all_int4le(_int4, int4)`
`210`	`222`	`RETURNS bool`
`211`	`223`	`AS 'MODULE_PATHNAME'`
`212`		`-LANGUAGE 'C'WITH (isStrict);`
	`224`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`213`	`225`
	`226`	`+DROP OPERATOR *=(_int4,int4);`
`214`	`227`	`CREATE OPERATOR *= (`
`215`	`228`	`LEFTARG=_int4,`
`216`	`229`	`RIGHTARG=int4,`
`217`	`230`	`PROCEDURE=array_int4eq`
`218`	`231`	`);`
`219`	`232`
	`233`	`+DROP OPERATOR **=(_int4,int4);`
`220`	`234`	`CREATE OPERATOR **= (`
`221`	`235`	`LEFTARG=_int4,`
`222`	`236`	`RIGHTARG=int4,`
`223`	`237`	`PROCEDURE=array_all_int4eq`
`224`	`238`	`);`
`225`	`239`
	`240`	`+DROP OPERATOR *<>(_int4,int4);`
`226`	`241`	`CREATE OPERATOR *<> (`
`227`	`242`	`LEFTARG=_int4,`
`228`	`243`	`RIGHTARG=int4,`
`229`	`244`	`PROCEDURE=array_int4ne`
`230`	`245`	`);`
`231`	`246`
	`247`	`+DROP OPERATOR **<>(_int4,int4);`
`232`	`248`	`CREATE OPERATOR **<> (`
`233`	`249`	`LEFTARG=_int4,`
`234`	`250`	`RIGHTARG=int4,`
`235`	`251`	`PROCEDURE=array_all_int4ne`
`236`	`252`	`);`
`237`	`253`
	`254`	`+DROP OPERATOR *>(_int4,int4);`
`238`	`255`	`CREATE OPERATOR *> (`
`239`	`256`	`LEFTARG=_int4,`
`240`	`257`	`RIGHTARG=int4,`
`241`	`258`	`PROCEDURE=array_int4gt`
`242`	`259`	`);`
`243`	`260`
	`261`	`+DROP OPERATOR **>(_int4,int4);`
`244`	`262`	`CREATE OPERATOR **> (`
`245`	`263`	`LEFTARG=_int4,`
`246`	`264`	`RIGHTARG=int4,`
`247`	`265`	`PROCEDURE=array_all_int4gt`
`248`	`266`	`);`
`249`	`267`
	`268`	`+DROP OPERATOR *>=(_int4,int4);`
`250`	`269`	`CREATE OPERATOR *>= (`
`251`	`270`	`LEFTARG=_int4,`
`252`	`271`	`RIGHTARG=int4,`
`253`	`272`	`PROCEDURE=array_int4ge`
`254`	`273`	`);`
`255`	`274`
	`275`	`+DROP OPERATOR **>=(_int4,int4);`
`256`	`276`	`CREATE OPERATOR **>= (`
`257`	`277`	`LEFTARG=_int4,`
`258`	`278`	`RIGHTARG=int4,`
`259`	`279`	`PROCEDURE=array_all_int4ge`
`260`	`280`	`);`
`261`	`281`
	`282`	`+DROP OPERATOR *<(_int4,int4);`
`262`	`283`	`CREATE OPERATOR *< (`
`263`	`284`	`LEFTARG=_int4,`
`264`	`285`	`RIGHTARG=int4,`
`265`	`286`	`PROCEDURE=array_int4lt`
`266`	`287`	`);`
`267`	`288`
	`289`	`+DROP OPERATOR **<(_int4,int4);`
`268`	`290`	`CREATE OPERATOR **< (`
`269`	`291`	`LEFTARG=_int4,`
`270`	`292`	`RIGHTARG=int4,`
`271`	`293`	`PROCEDURE=array_all_int4lt`
`272`	`294`	`);`
`273`	`295`
	`296`	`+DROP OPERATOR *<=(_int4,int4);`
`274`	`297`	`CREATE OPERATOR *<= (`
`275`	`298`	`LEFTARG=_int4,`
`276`	`299`	`RIGHTARG=int4,`
`277`	`300`	`PROCEDURE=array_int4le`
`278`	`301`	`);`
`279`	`302`
	`303`	`+DROP OPERATOR **<=(_int4,int4);`
`280`	`304`	`CREATE OPERATOR **<= (`
`281`	`305`	`LEFTARG=_int4,`
`282`	`306`	`RIGHTARG=int4,`
`@@ -288,19 +312,21 @@ CREATE OPERATOR **<= (`
`288`	`312`	`CREATE OR REPLACE FUNCTION array_oideq(_oid, oid)`
`289`	`313`	`RETURNS bool`
`290`	`314`	`AS 'MODULE_PATHNAME'`
`291`		`-LANGUAGE 'C'WITH (isStrict);`
	`315`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`292`	`316`
`293`	`317`	`CREATE OR REPLACE FUNCTION array_all_oidne(_oid, oid)`
`294`	`318`	`RETURNS bool`
`295`	`319`	`AS 'MODULE_PATHNAME'`
`296`		`-LANGUAGE 'C'WITH (isStrict);`
	`320`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`297`	`321`
	`322`	`+DROP OPERATOR *=(_oid,oid);`
`298`	`323`	`CREATE OPERATOR *= (`
`299`	`324`	`LEFTARG=_oid,`
`300`	`325`	`RIGHTARG=oid,`
`301`	`326`	`PROCEDURE=array_oideq`
`302`	`327`	`);`
`303`	`328`
	`329`	`+DROP OPERATOR **<>(_oid,oid);`
`304`	`330`	`CREATE OPERATOR **<> (`
`305`	`331`	`LEFTARG=_oid,`
`306`	`332`	`RIGHTARG=oid,`
`@@ -312,41 +338,45 @@ CREATE OPERATOR **<> (`
`312`	`338`	`CREATE OR REPLACE FUNCTION array_ineteq(_inet, inet)`
`313`	`339`	`RETURNS bool`
`314`	`340`	`AS 'MODULE_PATHNAME'`
`315`		`-LANGUAGE 'C'WITH (isStrict);`
	`341`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`316`	`342`
`317`	`343`	`CREATE OR REPLACE FUNCTION array_all_ineteq(_inet, inet)`
`318`	`344`	`RETURNS bool`
`319`	`345`	`AS 'MODULE_PATHNAME'`
`320`		`-LANGUAGE 'C'WITH (isStrict);`
	`346`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`321`	`347`
`322`	`348`	`CREATE OR REPLACE FUNCTION array_inetne(_inet, inet)`
`323`	`349`	`RETURNS bool`
`324`	`350`	`AS 'MODULE_PATHNAME'`
`325`		`-LANGUAGE 'C'WITH (isStrict);`
	`351`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`326`	`352`
`327`	`353`	`CREATE OR REPLACE FUNCTION array_all_inetne(_inet, inet)`
`328`	`354`	`RETURNS bool`
`329`	`355`	`AS 'MODULE_PATHNAME'`
`330`		`-LANGUAGE 'C'WITH (isStrict);`
	`356`	`+LANGUAGE 'C'IMMUTABLE STRICT;`
`331`	`357`
	`358`	`+DROP OPERATOR *=(_inet,inet);`
`332`	`359`	`CREATE OPERATOR *= (`
`333`	`360`	`LEFTARG=_inet,`
`334`	`361`	`RIGHTARG=inet,`
`335`	`362`	`PROCEDURE=array_ineteq`
`336`	`363`	`);`
`337`	`364`
	`365`	`+DROP OPERATOR **=(_inet,inet);`
`338`	`366`	`CREATE OPERATOR **= (`
`339`	`367`	`LEFTARG=_inet,`
`340`	`368`	`RIGHTARG=inet,`
`341`	`369`	`PROCEDURE=array_all_ineteq`
`342`	`370`	`);`
`343`	`371`
	`372`	`+DROP OPERATOR *<>(_inet,inet);`
`344`	`373`	`CREATE OPERATOR *<> (`
`345`	`374`	`LEFTARG=_inet,`
`346`	`375`	`RIGHTARG=inet,`
`347`	`376`	`PROCEDURE=array_inetne`
`348`	`377`	`);`
`349`	`378`
	`379`	`+DROP OPERATOR **<>(_inet,inet);`
`350`	`380`	`CREATE OPERATOR **<> (`
`351`	`381`	`LEFTARG=_inet,`
`352`	`382`	`RIGHTARG=inet,`

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!

Commitee30373

File tree

2 files changed

2 files changed

`‎contrib/array/array_iterator.sql.in`

0 commit comments