Skip to content

Commit 316c6dc

Browse files
sfacklersfackler
committed
Update codegen sources to 13.1
1 parent 6e9ee0f commit 316c6dc

File tree

5 files changed

+410
-297
lines changed

5 files changed

+410
-297
lines changed

‎codegen/src/errcodes.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# errcodes.txt
33
# PostgreSQL error codes
44
#
5-
# Copyright (c) 2003-2019, PostgreSQL Global Development Group
5+
# Copyright (c) 2003-2020, PostgreSQL Global Development Group
66
#
77
# This list serves as the basis for generating source files containing error
88
# codes. It is kept in a common format to make sure all these source files have
@@ -207,6 +207,7 @@ Section: Class 22 - Data Exception
207207
2200S E ERRCODE_INVALID_XML_COMMENT invalid_xml_comment
208208
2200T E ERRCODE_INVALID_XML_PROCESSING_INSTRUCTION invalid_xml_processing_instruction
209209
22030 E ERRCODE_DUPLICATE_JSON_OBJECT_KEY_VALUE duplicate_json_object_key_value
210+
22031 E ERRCODE_INVALID_ARGUMENT_FOR_SQL_JSON_DATETIME_FUNCTION invalid_argument_for_sql_json_datetime_function
210211
22032 E ERRCODE_INVALID_JSON_TEXT invalid_json_text
211212
22033 E ERRCODE_INVALID_SQL_JSON_SUBSCRIPT invalid_sql_json_subscript
212213
22034 E ERRCODE_MORE_THAN_ONE_SQL_JSON_ITEM more_than_one_sql_json_item

‎codegen/src/pg_range.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# pg_range.dat
44
# Initial contents of the pg_range system catalog.
55
#
6-
# Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
6+
# Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
77
# Portions Copyright (c) 1994, Regents of the University of California
88
#
99
# src/include/catalog/pg_range.dat

‎codegen/src/pg_type.dat

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# pg_type.dat
44
# Initial contents of the pg_type system catalog.
55
#
6-
# Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
6+
# Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
77
# Portions Copyright (c) 1994, Regents of the University of California
88
#
99
# src/include/catalog/pg_type.dat
@@ -177,6 +177,10 @@
177177
typtype => 'p', typcategory => 'P', typinput => 'pg_ddl_command_in',
178178
typoutput => 'pg_ddl_command_out', typreceive => 'pg_ddl_command_recv',
179179
typsend => 'pg_ddl_command_send', typalign => 'ALIGNOF_POINTER' },
180+
{ oid => '5069', array_type_oid => '271', descr => 'full transaction id',
181+
typname => 'xid8', typlen => '8', typbyval => 'FLOAT8PASSBYVAL',
182+
typcategory => 'U', typinput => 'xid8in', typoutput => 'xid8out',
183+
typreceive => 'xid8recv', typsend => 'xid8send', typalign => 'd' },
180184

181185
# OIDS 600 - 699
182186

@@ -215,9 +219,9 @@
215219

216220
{ oid => '700', array_type_oid => '1021',
217221
descr => 'single-precision floating point number, 4-byte storage',
218-
typname => 'float4', typlen => '4', typbyval => 'FLOAT4PASSBYVAL',
219-
typcategory => 'N', typinput => 'float4in', typoutput => 'float4out',
220-
typreceive => 'float4recv', typsend => 'float4send', typalign => 'i' },
222+
typname => 'float4', typlen => '4', typbyval => 't', typcategory => 'N',
223+
typinput => 'float4in', typoutput => 'float4out', typreceive => 'float4recv',
224+
typsend => 'float4send', typalign => 'i' },
221225
{ oid => '701', array_type_oid => '1022',
222226
descr => 'double-precision floating point number, 8-byte storage',
223227
typname => 'float8', typlen => '8', typbyval => 'FLOAT8PASSBYVAL',
@@ -379,6 +383,11 @@
379383
typname => 'regclass', typlen => '4', typbyval => 't', typcategory => 'N',
380384
typinput => 'regclassin', typoutput => 'regclassout',
381385
typreceive => 'regclassrecv', typsend => 'regclasssend', typalign => 'i' },
386+
{ oid => '4191', array_type_oid => '4192', descr => 'registered collation',
387+
typname => 'regcollation', typlen => '4', typbyval => 't', typcategory => 'N',
388+
typinput => 'regcollationin', typoutput => 'regcollationout',
389+
typreceive => 'regcollationrecv', typsend => 'regcollationsend',
390+
typalign => 'i' },
382391
{ oid => '2206', array_type_oid => '2211', descr => 'registered type',
383392
typname => 'regtype', typlen => '4', typbyval => 't', typcategory => 'N',
384393
typinput => 'regtypein', typoutput => 'regtypeout',
@@ -451,6 +460,11 @@
451460
typcategory => 'U', typinput => 'txid_snapshot_in',
452461
typoutput => 'txid_snapshot_out', typreceive => 'txid_snapshot_recv',
453462
typsend => 'txid_snapshot_send', typalign => 'd', typstorage => 'x' },
463+
{ oid => '5038', array_type_oid => '5039', descr => 'snapshot',
464+
typname => 'pg_snapshot', typlen => '-1', typbyval => 'f', typcategory => 'U',
465+
typinput => 'pg_snapshot_in', typoutput => 'pg_snapshot_out',
466+
typreceive => 'pg_snapshot_recv', typsend => 'pg_snapshot_send',
467+
typalign => 'd', typstorage => 'x' },
454468

455469
# range types
456470
{ oid => '3904', array_type_oid => '3905', descr => 'range of integers',
@@ -546,10 +560,6 @@
546560
typtype => 'p', typcategory => 'P', typinput => 'internal_in',
547561
typoutput => 'internal_out', typreceive => '-', typsend => '-',
548562
typalign => 'ALIGNOF_POINTER' },
549-
{ oid => '2282', descr => 'obsolete, deprecated pseudo-type',
550-
typname => 'opaque', typlen => '4', typbyval => 't', typtype => 'p',
551-
typcategory => 'P', typinput => 'opaque_in', typoutput => 'opaque_out',
552-
typreceive => '-', typsend => '-', typalign => 'i' },
553563
{ oid => '2283', descr => 'pseudo-type representing a polymorphic base type',
554564
typname => 'anyelement', typlen => '4', typbyval => 't', typtype => 'p',
555565
typcategory => 'P', typinput => 'anyelement_in',
@@ -590,9 +600,34 @@
590600
typoutput => 'table_am_handler_out', typreceive => '-', typsend => '-',
591601
typalign => 'i' },
592602
{ oid => '3831',
593-
descr => 'pseudo-type representing a polymorphic base type that is a range',
603+
descr => 'pseudo-type representing a range over a polymorphic base type',
594604
typname => 'anyrange', typlen => '-1', typbyval => 'f', typtype => 'p',
595605
typcategory => 'P', typinput => 'anyrange_in', typoutput => 'anyrange_out',
596606
typreceive => '-', typsend => '-', typalign => 'd', typstorage => 'x' },
607+
{ oid => '5077',
608+
descr => 'pseudo-type representing a polymorphic common type',
609+
typname => 'anycompatible', typlen => '4', typbyval => 't', typtype => 'p',
610+
typcategory => 'P', typinput => 'anycompatible_in',
611+
typoutput => 'anycompatible_out', typreceive => '-', typsend => '-',
612+
typalign => 'i' },
613+
{ oid => '5078',
614+
descr => 'pseudo-type representing an array of polymorphic common type elements',
615+
typname => 'anycompatiblearray', typlen => '-1', typbyval => 'f',
616+
typtype => 'p', typcategory => 'P', typinput => 'anycompatiblearray_in',
617+
typoutput => 'anycompatiblearray_out',
618+
typreceive => 'anycompatiblearray_recv', typsend => 'anycompatiblearray_send',
619+
typalign => 'd', typstorage => 'x' },
620+
{ oid => '5079',
621+
descr => 'pseudo-type representing a polymorphic common type that is not an array',
622+
typname => 'anycompatiblenonarray', typlen => '4', typbyval => 't',
623+
typtype => 'p', typcategory => 'P', typinput => 'anycompatiblenonarray_in',
624+
typoutput => 'anycompatiblenonarray_out', typreceive => '-', typsend => '-',
625+
typalign => 'i' },
626+
{ oid => '5080',
627+
descr => 'pseudo-type representing a range over a polymorphic common type',
628+
typname => 'anycompatiblerange', typlen => '-1', typbyval => 'f',
629+
typtype => 'p', typcategory => 'P', typinput => 'anycompatiblerange_in',
630+
typoutput => 'anycompatiblerange_out', typreceive => '-', typsend => '-',
631+
typalign => 'd', typstorage => 'x' },
597632

598633
]

‎postgres-types/src/type_gen.rs

Lines changed: 81 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ pub enum Inner {
3535
PgNodeTree,
3636
JsonArray,
3737
TableAmHandler,
38+
Xid8Array,
3839
IndexAmHandler,
3940
Point,
4041
Lseg,
@@ -125,7 +126,6 @@ pub enum Inner {
125126
Trigger,
126127
LanguageHandler,
127128
Internal,
128-
Opaque,
129129
Anyelement,
130130
RecordArray,
131131
Anynonarray,
@@ -172,7 +172,16 @@ pub enum Inner {
172172
RegnamespaceArray,
173173
Regrole,
174174
RegroleArray,
175+
Regcollation,
176+
RegcollationArray,
175177
PgMcvList,
178+
PgSnapshot,
179+
PgSnapshotArray,
180+
Xid8,
181+
Anycompatible,
182+
Anycompatiblearray,
183+
Anycompatiblenonarray,
184+
AnycompatibleRange,
176185
Other(Arc<Other>),
177186
}
178187

@@ -201,6 +210,7 @@ impl Inner {
201210
194 => Some(Inner::PgNodeTree),
202211
199 => Some(Inner::JsonArray),
203212
269 => Some(Inner::TableAmHandler),
213+
271 => Some(Inner::Xid8Array),
204214
325 => Some(Inner::IndexAmHandler),
205215
600 => Some(Inner::Point),
206216
601 => Some(Inner::Lseg),
@@ -291,7 +301,6 @@ impl Inner {
291301
2279 => Some(Inner::Trigger),
292302
2280 => Some(Inner::LanguageHandler),
293303
2281 => Some(Inner::Internal),
294-
2282 => Some(Inner::Opaque),
295304
2283 => Some(Inner::Anyelement),
296305
2287 => Some(Inner::RecordArray),
297306
2776 => Some(Inner::Anynonarray),
@@ -338,7 +347,16 @@ impl Inner {
338347
4090 => Some(Inner::RegnamespaceArray),
339348
4096 => Some(Inner::Regrole),
340349
4097 => Some(Inner::RegroleArray),
350+
4191 => Some(Inner::Regcollation),
351+
4192 => Some(Inner::RegcollationArray),
341352
5017 => Some(Inner::PgMcvList),
353+
5038 => Some(Inner::PgSnapshot),
354+
5039 => Some(Inner::PgSnapshotArray),
355+
5069 => Some(Inner::Xid8),
356+
5077 => Some(Inner::Anycompatible),
357+
5078 => Some(Inner::Anycompatiblearray),
358+
5079 => Some(Inner::Anycompatiblenonarray),
359+
5080 => Some(Inner::AnycompatibleRange),
342360
_ => None,
343361
}
344362
}
@@ -367,6 +385,7 @@ impl Inner {
367385
Inner::PgNodeTree => 194,
368386
Inner::JsonArray => 199,
369387
Inner::TableAmHandler => 269,
388+
Inner::Xid8Array => 271,
370389
Inner::IndexAmHandler => 325,
371390
Inner::Point => 600,
372391
Inner::Lseg => 601,
@@ -457,7 +476,6 @@ impl Inner {
457476
Inner::Trigger => 2279,
458477
Inner::LanguageHandler => 2280,
459478
Inner::Internal => 2281,
460-
Inner::Opaque => 2282,
461479
Inner::Anyelement => 2283,
462480
Inner::RecordArray => 2287,
463481
Inner::Anynonarray => 2776,
@@ -504,7 +522,16 @@ impl Inner {
504522
Inner::RegnamespaceArray => 4090,
505523
Inner::Regrole => 4096,
506524
Inner::RegroleArray => 4097,
525+
Inner::Regcollation => 4191,
526+
Inner::RegcollationArray => 4192,
507527
Inner::PgMcvList => 5017,
528+
Inner::PgSnapshot => 5038,
529+
Inner::PgSnapshotArray => 5039,
530+
Inner::Xid8 => 5069,
531+
Inner::Anycompatible => 5077,
532+
Inner::Anycompatiblearray => 5078,
533+
Inner::Anycompatiblenonarray => 5079,
534+
Inner::AnycompatibleRange => 5080,
508535
Inner::Other(ref u) => u.oid,
509536
}
510537
}
@@ -533,6 +560,7 @@ impl Inner {
533560
Inner::PgNodeTree => &Kind::Simple,
534561
Inner::JsonArray => &Kind::Array(Type(Inner::Json)),
535562
Inner::TableAmHandler => &Kind::Pseudo,
563+
Inner::Xid8Array => &Kind::Array(Type(Inner::Xid8)),
536564
Inner::IndexAmHandler => &Kind::Pseudo,
537565
Inner::Point => &Kind::Simple,
538566
Inner::Lseg => &Kind::Simple,
@@ -623,7 +651,6 @@ impl Inner {
623651
Inner::Trigger => &Kind::Pseudo,
624652
Inner::LanguageHandler => &Kind::Pseudo,
625653
Inner::Internal => &Kind::Pseudo,
626-
Inner::Opaque => &Kind::Pseudo,
627654
Inner::Anyelement => &Kind::Pseudo,
628655
Inner::RecordArray => &Kind::Pseudo,
629656
Inner::Anynonarray => &Kind::Pseudo,
@@ -670,7 +697,16 @@ impl Inner {
670697
Inner::RegnamespaceArray => &Kind::Array(Type(Inner::Regnamespace)),
671698
Inner::Regrole => &Kind::Simple,
672699
Inner::RegroleArray => &Kind::Array(Type(Inner::Regrole)),
700+
Inner::Regcollation => &Kind::Simple,
701+
Inner::RegcollationArray => &Kind::Array(Type(Inner::Regcollation)),
673702
Inner::PgMcvList => &Kind::Simple,
703+
Inner::PgSnapshot => &Kind::Simple,
704+
Inner::PgSnapshotArray => &Kind::Array(Type(Inner::PgSnapshot)),
705+
Inner::Xid8 => &Kind::Simple,
706+
Inner::Anycompatible => &Kind::Pseudo,
707+
Inner::Anycompatiblearray => &Kind::Pseudo,
708+
Inner::Anycompatiblenonarray => &Kind::Pseudo,
709+
Inner::AnycompatibleRange => &Kind::Pseudo,
674710
Inner::Other(ref u) => &u.kind,
675711
}
676712
}
@@ -699,6 +735,7 @@ impl Inner {
699735
Inner::PgNodeTree => "pg_node_tree",
700736
Inner::JsonArray => "_json",
701737
Inner::TableAmHandler => "table_am_handler",
738+
Inner::Xid8Array => "_xid8",
702739
Inner::IndexAmHandler => "index_am_handler",
703740
Inner::Point => "point",
704741
Inner::Lseg => "lseg",
@@ -789,7 +826,6 @@ impl Inner {
789826
Inner::Trigger => "trigger",
790827
Inner::LanguageHandler => "language_handler",
791828
Inner::Internal => "internal",
792-
Inner::Opaque => "opaque",
793829
Inner::Anyelement => "anyelement",
794830
Inner::RecordArray => "_record",
795831
Inner::Anynonarray => "anynonarray",
@@ -836,7 +872,16 @@ impl Inner {
836872
Inner::RegnamespaceArray => "_regnamespace",
837873
Inner::Regrole => "regrole",
838874
Inner::RegroleArray => "_regrole",
875+
Inner::Regcollation => "regcollation",
876+
Inner::RegcollationArray => "_regcollation",
839877
Inner::PgMcvList => "pg_mcv_list",
878+
Inner::PgSnapshot => "pg_snapshot",
879+
Inner::PgSnapshotArray => "_pg_snapshot",
880+
Inner::Xid8 => "xid8",
881+
Inner::Anycompatible => "anycompatible",
882+
Inner::Anycompatiblearray => "anycompatiblearray",
883+
Inner::Anycompatiblenonarray => "anycompatiblenonarray",
884+
Inner::AnycompatibleRange => "anycompatiblerange",
840885
Inner::Other(ref u) => &u.name,
841886
}
842887
}
@@ -908,6 +953,9 @@ impl Type {
908953
/// TABLE_AM_HANDLER
909954
pub const TABLE_AM_HANDLER: Type = Type(Inner::TableAmHandler);
910955

956+
/// XID8&#91;&#93;
957+
pub const XID8_ARRAY: Type = Type(Inner::Xid8Array);
958+
911959
/// INDEX_AM_HANDLER - pseudo-type for the result of an index AM handler function
912960
pub const INDEX_AM_HANDLER: Type = Type(Inner::IndexAmHandler);
913961

@@ -1178,9 +1226,6 @@ impl Type {
11781226
/// INTERNAL - pseudo-type representing an internal data structure
11791227
pub const INTERNAL: Type = Type(Inner::Internal);
11801228

1181-
/// OPAQUE - obsolete, deprecated pseudo-type
1182-
pub const OPAQUE: Type = Type(Inner::Opaque);
1183-
11841229
/// ANYELEMENT - pseudo-type representing a polymorphic base type
11851230
pub const ANYELEMENT: Type = Type(Inner::Anyelement);
11861231

@@ -1259,7 +1304,7 @@ impl Type {
12591304
/// JSONB&#91;&#93;
12601305
pub const JSONB_ARRAY: Type = Type(Inner::JsonbArray);
12611306

1262-
/// ANYRANGE - pseudo-type representing a polymorphic base type that is a range
1307+
/// ANYRANGE - pseudo-type representing a range over a polymorphic base type
12631308
pub const ANY_RANGE: Type = Type(Inner::AnyRange);
12641309

12651310
/// EVENT_TRIGGER - pseudo-type for the result of an event trigger function
@@ -1319,6 +1364,33 @@ impl Type {
13191364
/// REGROLE&#91;&#93;
13201365
pub const REGROLE_ARRAY: Type = Type(Inner::RegroleArray);
13211366

1367+
/// REGCOLLATION - registered collation
1368+
pub const REGCOLLATION: Type = Type(Inner::Regcollation);
1369+
1370+
/// REGCOLLATION&#91;&#93;
1371+
pub const REGCOLLATION_ARRAY: Type = Type(Inner::RegcollationArray);
1372+
13221373
/// PG_MCV_LIST - multivariate MCV list
13231374
pub const PG_MCV_LIST: Type = Type(Inner::PgMcvList);
1375+
1376+
/// PG_SNAPSHOT - snapshot
1377+
pub const PG_SNAPSHOT: Type = Type(Inner::PgSnapshot);
1378+
1379+
/// PG_SNAPSHOT&#91;&#93;
1380+
pub const PG_SNAPSHOT_ARRAY: Type = Type(Inner::PgSnapshotArray);
1381+
1382+
/// XID8 - full transaction id
1383+
pub const XID8: Type = Type(Inner::Xid8);
1384+
1385+
/// ANYCOMPATIBLE - pseudo-type representing a polymorphic common type
1386+
pub const ANYCOMPATIBLE: Type = Type(Inner::Anycompatible);
1387+
1388+
/// ANYCOMPATIBLEARRAY - pseudo-type representing an array of polymorphic common type elements
1389+
pub const ANYCOMPATIBLEARRAY: Type = Type(Inner::Anycompatiblearray);
1390+
1391+
/// ANYCOMPATIBLENONARRAY - pseudo-type representing a polymorphic common type that is not an array
1392+
pub const ANYCOMPATIBLENONARRAY: Type = Type(Inner::Anycompatiblenonarray);
1393+
1394+
/// ANYCOMPATIBLERANGE - pseudo-type representing a range over a polymorphic common type
1395+
pub const ANYCOMPATIBLE_RANGE: Type = Type(Inner::AnycompatibleRange);
13241396
}

0 commit comments

Comments
 (0)