NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit6a208aa

committed

Allow casting a table's row type to the table's supertype if it's a typed table

This is analogous to the existing facility that allows casting a row type to asupertable's row type.

1 parent92a73d2 commit6a208aaCopy full SHA for 6a208aa

File tree

3 files changed

+64

-2

lines changed

src
- backend/parser
  - parse_coerce.c
- test/regress
  - expected
    - typed_table.out
  - sql
    - typed_table.sql

3 files changed

+64

-2

lines changed

`‎src/backend/parser/parse_coerce.c‎`

Lines changed: 37 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`	`17`	`#include"catalog/pg_cast.h"`
	`18`	`+#include"catalog/pg_class.h"`
`18`	`19`	`#include"catalog/pg_inherits_fn.h"`
`19`	`20`	`#include"catalog/pg_proc.h"`
`20`	`21`	`#include"catalog/pg_type.h"`
`@@ -48,6 +49,7 @@ static Node coerce_record_to_complex(ParseState pstate, Node *node,`
`48`	`49`	`CoercionFormcformat,`
`49`	`50`	`intlocation);`
`50`	`51`	`staticboolis_complex_array(Oidtypid);`
	`52`	`+staticbooltypeIsOfTypedTable(OidreltypeId,OidreloftypeId);`
`51`	`53`
`52`	`54`
`53`	`55`	`/*`
`@@ -371,7 +373,8 @@ coerce_type(ParseState pstate, Node node,`
`371`	`373`	`/* NB: we do NOT want a RelabelType here */`
`372`	`374`	`returnnode;`
`373`	`375`	`}`
`374`		`-if (typeInheritsFrom(inputTypeId,targetTypeId))`
	`376`	`+if (typeInheritsFrom(inputTypeId,targetTypeId)`
	`377`	`+\|\|typeIsOfTypedTable(inputTypeId,targetTypeId))`
`375`	`378`	`{`
`376`	`379`	`/*`
`377`	`380`	`* Input class type is a subclass of target, so generate an`
`@@ -482,7 +485,8 @@ can_coerce_type(int nargs, Oid input_typeids, Oid target_typeids,`
`482`	`485`	`/*`
`483`	`486`	`* If input is a class type that inherits from target, accept`
`484`	`487`	`*/`
`485`		`-if (typeInheritsFrom(inputTypeId,targetTypeId))`
	`488`	`+if (typeInheritsFrom(inputTypeId,targetTypeId)`
	`489`	`+\|\|typeIsOfTypedTable(inputTypeId,targetTypeId))`
`486`	`490`	`continue;`
`487`	`491`
`488`	`492`	`/*`
`@@ -2046,3 +2050,34 @@ is_complex_array(Oid typid)`
`2046`	`2050`
`2047`	`2051`	`return (OidIsValid(elemtype)&&ISCOMPLEX(elemtype));`
`2048`	`2052`	`}`
	`2053`	`+`
	`2054`	`+`
	`2055`	`+/*`
	`2056`	`+ * Check whether reltypeId is the row type of a typed table of type`
	`2057`	`+ * reloftypeId. (This is conceptually similar to the subtype`
	`2058`	`+ * relationship checked by typeInheritsFrom().)`
	`2059`	`+ */`
	`2060`	`+staticbool`
	`2061`	`+typeIsOfTypedTable(OidreltypeId,OidreloftypeId)`
	`2062`	`+{`
	`2063`	`+Oidrelid=typeidTypeRelid(reltypeId);`
	`2064`	`+boolresult= false;`
	`2065`	`+`
	`2066`	`+if (relid)`
	`2067`	`+{`
	`2068`	`+HeapTupletp;`
	`2069`	`+Form_pg_classreltup;`
	`2070`	`+`
	`2071`	`+tp=SearchSysCache1(RELOID,ObjectIdGetDatum(relid));`
	`2072`	`+if (!HeapTupleIsValid(tp))`
	`2073`	`+elog(ERROR,"cache lookup failed for relation %u",relid);`
	`2074`	`+`
	`2075`	`+reltup= (Form_pg_class)GETSTRUCT(tp);`
	`2076`	`+if (reltup->reloftype==reloftypeId)`
	`2077`	`+result= true;`
	`2078`	`+`
	`2079`	`+ReleaseSysCache(tp);`
	`2080`	`+}`
	`2081`	`+`
	`2082`	`+returnresult;`
	`2083`	`+}`

`‎src/test/regress/expected/typed_table.out‎`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,3 +92,18 @@ drop cascades to function get_all_persons()`
`92`	`92`	`drop cascades to table persons2`
`93`	`93`	`drop cascades to table persons3`
`94`	`94`	`DROP TABLE stuff;`
	`95`	`+-- implicit casting`
	`96`	`+CREATE TYPE person_type AS (id int, name text);`
	`97`	`+CREATE TABLE persons OF person_type;`
	`98`	`+INSERT INTO persons VALUES (1, 'test');`
	`99`	`+CREATE FUNCTION namelen(person_type) RETURNS int LANGUAGE SQL AS $$ SELECT length($1.name) $$;`
	`100`	`+SELECT id, namelen(persons) FROM persons;`
	`101`	`+ id \| namelen`
	`102`	`+----+---------`
	`103`	`+ 1 \| 4`
	`104`	`+(1 row)`
	`105`	`+`
	`106`	`+DROP TYPE person_type CASCADE;`
	`107`	`+NOTICE: drop cascades to 2 other objects`
	`108`	`+DETAIL: drop cascades to table persons`
	`109`	`+drop cascades to function namelen(person_type)`

`‎src/test/regress/sql/typed_table.sql‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,3 +47,15 @@ DROP TYPE person_type RESTRICT;`
`47`	`47`	`DROPTYPE person_type CASCADE;`
`48`	`48`
`49`	`49`	`DROPTABLE stuff;`
	`50`	`+`
	`51`	`+`
	`52`	`+-- implicit casting`
	`53`	`+`
	`54`	`+CREATETYPEperson_typeAS (idint, nametext);`
	`55`	`+CREATETABLEpersons OF person_type;`
	`56`	`+INSERT INTO personsVALUES (1,'test');`
	`57`	`+`
	`58`	`+CREATEFUNCTIONnamelen(person_type) RETURNSint LANGUAGE SQLAS $$SELECT length($1.name) $$;`
	`59`	`+SELECT id, namelen(persons)FROM persons;`
	`60`	`+`
	`61`	`+DROPTYPE person_type CASCADE;`

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!

Commit6a208aa

File tree

3 files changed

3 files changed

`‎src/backend/parser/parse_coerce.c‎`

`‎src/test/regress/expected/typed_table.out‎`

`‎src/test/regress/sql/typed_table.sql‎`

0 commit comments