diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
| -rw-r--r-- | src/include/catalog/pg_amop.dat | 69 | ||||
| -rw-r--r-- | src/include/catalog/pg_amproc.dat | 20 | ||||
| -rw-r--r-- | src/include/catalog/pg_opclass.dat | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_operator.dat | 59 | ||||
| -rw-r--r-- | src/include/catalog/pg_opfamily.dat | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_proc.dat | 43 |
7 files changed, 167 insertions, 34 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 887a620d33f..821bf5ba675 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 201812191 +#define CATALOG_VERSION_NO 201812192 #endif diff --git a/src/include/catalog/pg_amop.dat b/src/include/catalog/pg_amop.dat index 075a54c4acc..e689c9b160a 100644 --- a/src/include/catalog/pg_amop.dat +++ b/src/include/catalog/pg_amop.dat @@ -299,40 +299,67 @@ amoprighttype => 'char', amopstrategy => '5', amopopr => '>(char,char)', amopmethod => 'btree' }, -# btree name_ops +# btree text_ops -{ amopfamily => 'btree/name_ops', amoplefttype => 'name', +{ amopfamily => 'btree/text_ops', amoplefttype => 'text', + amoprighttype => 'text', amopstrategy => '1', amopopr => '<(text,text)', + amopmethod => 'btree' }, +{ amopfamily => 'btree/text_ops', amoplefttype => 'text', + amoprighttype => 'text', amopstrategy => '2', amopopr => '<=(text,text)', + amopmethod => 'btree' }, +{ amopfamily => 'btree/text_ops', amoplefttype => 'text', + amoprighttype => 'text', amopstrategy => '3', amopopr => '=(text,text)', + amopmethod => 'btree' }, +{ amopfamily => 'btree/text_ops', amoplefttype => 'text', + amoprighttype => 'text', amopstrategy => '4', amopopr => '>=(text,text)', + amopmethod => 'btree' }, +{ amopfamily => 'btree/text_ops', amoplefttype => 'text', + amoprighttype => 'text', amopstrategy => '5', amopopr => '>(text,text)', + amopmethod => 'btree' }, +{ amopfamily => 'btree/text_ops', amoplefttype => 'name', amoprighttype => 'name', amopstrategy => '1', amopopr => '<(name,name)', amopmethod => 'btree' }, -{ amopfamily => 'btree/name_ops', amoplefttype => 'name', +{ amopfamily => 'btree/text_ops', amoplefttype => 'name', amoprighttype => 'name', amopstrategy => '2', amopopr => '<=(name,name)', amopmethod => 'btree' }, -{ amopfamily => 'btree/name_ops', amoplefttype => 'name', +{ amopfamily => 'btree/text_ops', amoplefttype => 'name', amoprighttype => 'name', amopstrategy => '3', amopopr => '=(name,name)', amopmethod => 'btree' }, -{ amopfamily => 'btree/name_ops', amoplefttype => 'name', +{ amopfamily => 'btree/text_ops', amoplefttype => 'name', amoprighttype => 'name', amopstrategy => '4', amopopr => '>=(name,name)', amopmethod => 'btree' }, -{ amopfamily => 'btree/name_ops', amoplefttype => 'name', +{ amopfamily => 'btree/text_ops', amoplefttype => 'name', amoprighttype => 'name', amopstrategy => '5', amopopr => '>(name,name)', amopmethod => 'btree' }, - -# btree text_ops - +{ amopfamily => 'btree/text_ops', amoplefttype => 'name', + amoprighttype => 'text', amopstrategy => '1', amopopr => '<(name,text)', + amopmethod => 'btree' }, +{ amopfamily => 'btree/text_ops', amoplefttype => 'name', + amoprighttype => 'text', amopstrategy => '2', amopopr => '<=(name,text)', + amopmethod => 'btree' }, +{ amopfamily => 'btree/text_ops', amoplefttype => 'name', + amoprighttype => 'text', amopstrategy => '3', amopopr => '=(name,text)', + amopmethod => 'btree' }, +{ amopfamily => 'btree/text_ops', amoplefttype => 'name', + amoprighttype => 'text', amopstrategy => '4', amopopr => '>=(name,text)', + amopmethod => 'btree' }, +{ amopfamily => 'btree/text_ops', amoplefttype => 'name', + amoprighttype => 'text', amopstrategy => '5', amopopr => '>(name,text)', + amopmethod => 'btree' }, { amopfamily => 'btree/text_ops', amoplefttype => 'text', - amoprighttype => 'text', amopstrategy => '1', amopopr => '<(text,text)', + amoprighttype => 'name', amopstrategy => '1', amopopr => '<(text,name)', amopmethod => 'btree' }, { amopfamily => 'btree/text_ops', amoplefttype => 'text', - amoprighttype => 'text', amopstrategy => '2', amopopr => '<=(text,text)', + amoprighttype => 'name', amopstrategy => '2', amopopr => '<=(text,name)', amopmethod => 'btree' }, { amopfamily => 'btree/text_ops', amoplefttype => 'text', - amoprighttype => 'text', amopstrategy => '3', amopopr => '=(text,text)', + amoprighttype => 'name', amopstrategy => '3', amopopr => '=(text,name)', amopmethod => 'btree' }, { amopfamily => 'btree/text_ops', amoplefttype => 'text', - amoprighttype => 'text', amopstrategy => '4', amopopr => '>=(text,text)', + amoprighttype => 'name', amopstrategy => '4', amopopr => '>=(text,name)', amopmethod => 'btree' }, { amopfamily => 'btree/text_ops', amoplefttype => 'text', - amoprighttype => 'text', amopstrategy => '5', amopopr => '>(text,text)', + amoprighttype => 'name', amopstrategy => '5', amopopr => '>(text,name)', amopmethod => 'btree' }, # btree bpchar_ops @@ -925,11 +952,6 @@ amoprighttype => 'macaddr8', amopstrategy => '1', amopopr => '=(macaddr8,macaddr8)', amopmethod => 'hash' }, -# name_ops -{ amopfamily => 'hash/name_ops', amoplefttype => 'name', - amoprighttype => 'name', amopstrategy => '1', amopopr => '=(name,name)', - amopmethod => 'hash' }, - # oid_ops { amopfamily => 'hash/oid_ops', amoplefttype => 'oid', amoprighttype => 'oid', amopstrategy => '1', amopopr => '=(oid,oid)', amopmethod => 'hash' }, @@ -943,6 +965,15 @@ { amopfamily => 'hash/text_ops', amoplefttype => 'text', amoprighttype => 'text', amopstrategy => '1', amopopr => '=(text,text)', amopmethod => 'hash' }, +{ amopfamily => 'hash/text_ops', amoplefttype => 'name', + amoprighttype => 'name', amopstrategy => '1', amopopr => '=(name,name)', + amopmethod => 'hash' }, +{ amopfamily => 'hash/text_ops', amoplefttype => 'name', + amoprighttype => 'text', amopstrategy => '1', amopopr => '=(name,text)', + amopmethod => 'hash' }, +{ amopfamily => 'hash/text_ops', amoplefttype => 'text', + amoprighttype => 'name', amopstrategy => '1', amopopr => '=(text,name)', + amopmethod => 'hash' }, # time_ops { amopfamily => 'hash/time_ops', amoplefttype => 'time', diff --git a/src/include/catalog/pg_amproc.dat b/src/include/catalog/pg_amproc.dat index 0ef2c0885f2..bbcee26fa8b 100644 --- a/src/include/catalog/pg_amproc.dat +++ b/src/include/catalog/pg_amproc.dat @@ -148,10 +148,6 @@ { amprocfamily => 'btree/macaddr_ops', amproclefttype => 'macaddr', amprocrighttype => 'macaddr', amprocnum => '2', amproc => 'macaddr_sortsupport' }, -{ amprocfamily => 'btree/name_ops', amproclefttype => 'name', - amprocrighttype => 'name', amprocnum => '1', amproc => 'btnamecmp' }, -{ amprocfamily => 'btree/name_ops', amproclefttype => 'name', - amprocrighttype => 'name', amprocnum => '2', amproc => 'btnamesortsupport' }, { amprocfamily => 'btree/numeric_ops', amproclefttype => 'numeric', amprocrighttype => 'numeric', amprocnum => '1', amproc => 'numeric_cmp' }, { amprocfamily => 'btree/numeric_ops', amproclefttype => 'numeric', @@ -171,6 +167,14 @@ amprocrighttype => 'text', amprocnum => '1', amproc => 'bttextcmp' }, { amprocfamily => 'btree/text_ops', amproclefttype => 'text', amprocrighttype => 'text', amprocnum => '2', amproc => 'bttextsortsupport' }, +{ amprocfamily => 'btree/text_ops', amproclefttype => 'name', + amprocrighttype => 'name', amprocnum => '1', amproc => 'btnamecmp' }, +{ amprocfamily => 'btree/text_ops', amproclefttype => 'name', + amprocrighttype => 'name', amprocnum => '2', amproc => 'btnamesortsupport' }, +{ amprocfamily => 'btree/text_ops', amproclefttype => 'name', + amprocrighttype => 'text', amprocnum => '1', amproc => 'btnametextcmp' }, +{ amprocfamily => 'btree/text_ops', amproclefttype => 'text', + amprocrighttype => 'name', amprocnum => '1', amproc => 'bttextnamecmp' }, { amprocfamily => 'btree/time_ops', amproclefttype => 'time', amprocrighttype => 'time', amprocnum => '1', amproc => 'time_cmp' }, { amprocfamily => 'btree/time_ops', amproclefttype => 'time', @@ -276,10 +280,6 @@ { amprocfamily => 'hash/macaddr_ops', amproclefttype => 'macaddr', amprocrighttype => 'macaddr', amprocnum => '2', amproc => 'hashmacaddrextended' }, -{ amprocfamily => 'hash/name_ops', amproclefttype => 'name', - amprocrighttype => 'name', amprocnum => '1', amproc => 'hashname' }, -{ amprocfamily => 'hash/name_ops', amproclefttype => 'name', - amprocrighttype => 'name', amprocnum => '2', amproc => 'hashnameextended' }, { amprocfamily => 'hash/oid_ops', amproclefttype => 'oid', amprocrighttype => 'oid', amprocnum => '1', amproc => 'hashoid' }, { amprocfamily => 'hash/oid_ops', amproclefttype => 'oid', @@ -293,6 +293,10 @@ amprocrighttype => 'text', amprocnum => '1', amproc => 'hashtext' }, { amprocfamily => 'hash/text_ops', amproclefttype => 'text', amprocrighttype => 'text', amprocnum => '2', amproc => 'hashtextextended' }, +{ amprocfamily => 'hash/text_ops', amproclefttype => 'name', + amprocrighttype => 'name', amprocnum => '1', amproc => 'hashname' }, +{ amprocfamily => 'hash/text_ops', amproclefttype => 'name', + amprocrighttype => 'name', amprocnum => '2', amproc => 'hashnameextended' }, { amprocfamily => 'hash/time_ops', amproclefttype => 'time', amprocrighttype => 'time', amprocnum => '1', amproc => 'time_hash' }, { amprocfamily => 'hash/time_ops', amproclefttype => 'time', diff --git a/src/include/catalog/pg_opclass.dat b/src/include/catalog/pg_opclass.dat index 13928ba4a02..5178d04337f 100644 --- a/src/include/catalog/pg_opclass.dat +++ b/src/include/catalog/pg_opclass.dat @@ -93,10 +93,10 @@ # but cstring and name are the same thing except for trailing padding, # and we can safely omit that within an index entry. So we declare the # btree opclass for name as using cstring storage type. -{ opcmethod => 'btree', opcname => 'name_ops', opcfamily => 'btree/name_ops', +{ opcmethod => 'btree', opcname => 'name_ops', opcfamily => 'btree/text_ops', opcintype => 'name', opckeytype => 'cstring' }, -{ opcmethod => 'hash', opcname => 'name_ops', opcfamily => 'hash/name_ops', +{ opcmethod => 'hash', opcname => 'name_ops', opcfamily => 'hash/text_ops', opcintype => 'name' }, { oid => '3125', oid_symbol => 'NUMERIC_BTREE_OPS_OID', opcmethod => 'btree', opcname => 'numeric_ops', diff --git a/src/include/catalog/pg_operator.dat b/src/include/catalog/pg_operator.dat index ce23c2f0aa5..2abd5311c3e 100644 --- a/src/include/catalog/pg_operator.dat +++ b/src/include/catalog/pg_operator.dat @@ -107,6 +107,65 @@ oprcode => 'starts_with', oprrest => 'prefixsel', oprjoin => 'prefixjoinsel' }, +{ oid => '254', descr => 'equal', + oprname => '=', oprcanmerge => 't', oprcanhash => 't', oprleft => 'name', + oprright => 'text', oprresult => 'bool', oprcom => '=(text,name)', + oprnegate => '<>(name,text)', oprcode => 'nameeqtext', oprrest => 'eqsel', + oprjoin => 'eqjoinsel' }, +{ oid => '255', descr => 'less than', + oprname => '<', oprleft => 'name', oprright => 'text', oprresult => 'bool', + oprcom => '>(text,name)', oprnegate => '>=(name,text)', + oprcode => 'namelttext', oprrest => 'scalarltsel', + oprjoin => 'scalarltjoinsel' }, +{ oid => '256', descr => 'less than or equal', + oprname => '<=', oprleft => 'name', oprright => 'text', oprresult => 'bool', + oprcom => '>=(text,name)', oprnegate => '>(name,text)', + oprcode => 'nameletext', oprrest => 'scalarlesel', + oprjoin => 'scalarlejoinsel' }, +{ oid => '257', descr => 'greater than or equal', + oprname => '>=', oprleft => 'name', oprright => 'text', oprresult => 'bool', + oprcom => '<=(text,name)', oprnegate => '<(name,text)', + oprcode => 'namegetext', oprrest => 'scalargesel', + oprjoin => 'scalargejoinsel' }, +{ oid => '258', descr => 'greater than', + oprname => '>', oprleft => 'name', oprright => 'text', oprresult => 'bool', + oprcom => '<(text,name)', oprnegate => '<=(name,text)', + oprcode => 'namegttext', oprrest => 'scalargtsel', + oprjoin => 'scalargtjoinsel' }, +{ oid => '259', descr => 'not equal', + oprname => '<>', oprleft => 'name', oprright => 'text', oprresult => 'bool', + oprcom => '<>(text,name)', oprnegate => '=(name,text)', + oprcode => 'namenetext', oprrest => 'neqsel', oprjoin => 'neqjoinsel' }, +{ oid => '260', descr => 'equal', + oprname => '=', oprcanmerge => 't', oprcanhash => 't', oprleft => 'text', + oprright => 'name', oprresult => 'bool', oprcom => '=(name,text)', + oprnegate => '<>(text,name)', oprcode => 'texteqname', oprrest => 'eqsel', + oprjoin => 'eqjoinsel' }, +{ oid => '261', descr => 'less than', + oprname => '<', oprleft => 'text', oprright => 'name', oprresult => 'bool', + oprcom => '>(name,text)', oprnegate => '>=(text,name)', + oprcode => 'textltname', oprrest => 'scalarltsel', + oprjoin => 'scalarltjoinsel' }, +{ oid => '262', descr => 'less than or equal', + oprname => '<=', oprleft => 'text', oprright => 'name', oprresult => 'bool', + oprcom => '>=(name,text)', oprnegate => '>(text,name)', + oprcode => 'textlename', oprrest => 'scalarlesel', + oprjoin => 'scalarlejoinsel' }, +{ oid => '263', descr => 'greater than or equal', + oprname => '>=', oprleft => 'text', oprright => 'name', oprresult => 'bool', + oprcom => '<=(name,text)', oprnegate => '<(text,name)', + oprcode => 'textgename', oprrest => 'scalargesel', + oprjoin => 'scalargejoinsel' }, +{ oid => '264', descr => 'greater than', + oprname => '>', oprleft => 'text', oprright => 'name', oprresult => 'bool', + oprcom => '<(name,text)', oprnegate => '<=(text,name)', + oprcode => 'textgtname', oprrest => 'scalargtsel', + oprjoin => 'scalargtjoinsel' }, +{ oid => '265', descr => 'not equal', + oprname => '<>', oprleft => 'text', oprright => 'name', oprresult => 'bool', + oprcom => '<>(name,text)', oprnegate => '=(text,name)', + oprcode => 'textnename', oprrest => 'neqsel', oprjoin => 'neqjoinsel' }, + { oid => '349', descr => 'append element onto end of array', oprname => '||', oprleft => 'anyarray', oprright => 'anyelement', oprresult => 'anyarray', oprcode => 'array_append' }, diff --git a/src/include/catalog/pg_opfamily.dat b/src/include/catalog/pg_opfamily.dat index 21473acf348..fe8a32485f2 100644 --- a/src/include/catalog/pg_opfamily.dat +++ b/src/include/catalog/pg_opfamily.dat @@ -62,10 +62,6 @@ opfmethod => 'btree', opfname => 'macaddr8_ops' }, { oid => '3372', opfmethod => 'hash', opfname => 'macaddr8_ops' }, -{ oid => '1986', oid_symbol => 'NAME_BTREE_FAM_OID', - opfmethod => 'btree', opfname => 'name_ops' }, -{ oid => '1987', - opfmethod => 'hash', opfname => 'name_ops' }, { oid => '1988', opfmethod => 'btree', opfname => 'numeric_ops' }, { oid => '1998', diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index f79fcfe029f..d0a571ef956 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -673,6 +673,49 @@ proname => 'line_distance', prorettype => 'float8', proargtypes => 'line line', prosrc => 'line_distance' }, +{ oid => '240', + proname => 'nameeqtext', proleakproof => 't', prorettype => 'bool', + proargtypes => 'name text', prosrc => 'nameeqtext' }, +{ oid => '241', + proname => 'namelttext', proleakproof => 't', prorettype => 'bool', + proargtypes => 'name text', prosrc => 'namelttext' }, +{ oid => '242', + proname => 'nameletext', proleakproof => 't', prorettype => 'bool', + proargtypes => 'name text', prosrc => 'nameletext' }, +{ oid => '243', + proname => 'namegetext', proleakproof => 't', prorettype => 'bool', + proargtypes => 'name text', prosrc => 'namegetext' }, +{ oid => '244', + proname => 'namegttext', proleakproof => 't', prorettype => 'bool', + proargtypes => 'name text', prosrc => 'namegttext' }, +{ oid => '245', + proname => 'namenetext', proleakproof => 't', prorettype => 'bool', + proargtypes => 'name text', prosrc => 'namenetext' }, +{ oid => '246', descr => 'less-equal-greater', + proname => 'btnametextcmp', proleakproof => 't', prorettype => 'int4', + proargtypes => 'name text', prosrc => 'btnametextcmp' }, +{ oid => '247', + proname => 'texteqname', proleakproof => 't', prorettype => 'bool', + proargtypes => 'text name', prosrc => 'texteqname' }, +{ oid => '248', + proname => 'textltname', proleakproof => 't', prorettype => 'bool', + proargtypes => 'text name', prosrc => 'textltname' }, +{ oid => '249', + proname => 'textlename', proleakproof => 't', prorettype => 'bool', + proargtypes => 'text name', prosrc => 'textlename' }, +{ oid => '250', + proname => 'textgename', proleakproof => 't', prorettype => 'bool', + proargtypes => 'text name', prosrc => 'textgename' }, +{ oid => '251', + proname => 'textgtname', proleakproof => 't', prorettype => 'bool', + proargtypes => 'text name', prosrc => 'textgtname' }, +{ oid => '252', + proname => 'textnename', proleakproof => 't', prorettype => 'bool', + proargtypes => 'text name', prosrc => 'textnename' }, +{ oid => '253', descr => 'less-equal-greater', + proname => 'bttextnamecmp', proleakproof => 't', prorettype => 'int4', + proargtypes => 'text name', prosrc => 'bttextnamecmp' }, + { oid => '274', descr => 'current date and time - increments during transactions', proname => 'timeofday', provolatile => 'v', prorettype => 'text', |