Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vkv6H-004MC5-1t for pgsql-hackers@arkaria.postgresql.org; Wed, 28 Jan 2026 02:16:10 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.96) (envelope-from ) id 1vkv6G-00GfmR-1h for pgsql-hackers@arkaria.postgresql.org; Wed, 28 Jan 2026 02:16:08 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vkv6G-00GfmI-0V for pgsql-hackers@lists.postgresql.org; Wed, 28 Jan 2026 02:16:08 +0000 Received: from mail-dl1-x1232.google.com ([2607:f8b0:4864:20::1232]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.98.2) (envelope-from ) id 1vkv6D-00000000nwo-3daN for pgsql-hackers@lists.postgresql.org; Wed, 28 Jan 2026 02:16:08 +0000 Received: by mail-dl1-x1232.google.com with SMTP id a92af1059eb24-1249b9f5703so3068172c88.0 for ; Tue, 27 Jan 2026 18:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769566564; x=1770171364; darn=lists.postgresql.org; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=KL68115temZpxeSABWgSK4WaRffmjy8g5ES+iS4ug/k=; b=jAvr5OOvt9p3zQK4+8oFt2mVPzpYpIKLSY7axY7ehBSE/Y97g33n2GrsCmw1fkuSHP rdNHywWUPq8tJMXa57KstVMP0Pz3IkXAkeOsnIv92Ts2MiLKu5D12rEp0iGEkLOkuDIf LEVSklZsQkRJdzJ8FHJnnhLO/ei0DjpyJF+Kf8DfCksHtCrIKSfZYAdS3v2Cavdfuz35 XA5TYCDKk2FOztZMrScSRmJtVDsjpckv2aI3m7r+G8wSSCRk44+9jab8MER4fG7VecQn WSQkRBfX3YxxwfHnKhXzqSy2RF298J/9cGh4t8gIFcpu0LUkZtu8diL4/NMB62Fwd9V4 0Mgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769566564; x=1770171364; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KL68115temZpxeSABWgSK4WaRffmjy8g5ES+iS4ug/k=; b=YBgPAN92Fsn43EC0x9KuL7nZmM8RnS/1oElDomjlQLGvSVelf1TvzovpEaZTK0VlOs XRRigyWIJNoimrg5Kjj46s8NfSErl3FSGOzXxPjpFFgh5gEn50hT+HDMpSP9sfv4gFIN Uyot1IH+F88DYLqXFo2Tsw3Sgw9s8NufNH2QnLukxn8ri6gIcqhFijoRn/yajhEW1LW3 qkma8u56wqWC/xIalNDxmKm98GGAyhZ3x69ZE9DKMCEIH1n9rknQgx9qb/gNSHNRKMGo rjqG1uq/sq66SuVzGa1k3UUBHiFYc5yynQOLDrHJjabrxQfvUZYx8tHrSgPtFG7OGnrp EX8w== X-Gm-Message-State: AOJu0YyZ8FjBOhPRaZqSNMUIv79yKOnzBua4eFu32LgdOXqd4KpallGC hpB8MYyUo9plM4QQ5uZVyh9IBm9HOFNpXzFq6kWQNmKPCgNVDI/y4xqi X-Gm-Gg: AZuq6aKaz0V3X6Pe2kBgGuopYr4fotN6fZKtLwvG9DEkh+ufLWrfA8TSGn/Y84HsNY4 N12f6cji0pW9kTGejisjNX9ydVgWBX/3MX6aWfx39XSBATtFeS2FlYVf92k3G/+P7ekLZ6ADfTJ ggTo7apyk6NBDefaThBGH1BkdzN+dwixJIebYxk51WArGM1thNA03OZcFBOG1myOpgh5s1TlGF/ 4dn1s3P7yd8w7T5xuHNjorCZvKSGRKAidnYcPXi0agjQWnnX3jZEgWE7VrSpQFqpsNmSiwzuMIv B+Qw0NCMV/Hyd5Z5uthal8NaQl+eNqTLwIc2dkwtQf0vAkcJdUvqNKXiYQtmh59i2RBcC7p1OPw YIwY7bPf7TdbZo94L1+DawObv8vbolTuhpU/kL5DAki7lvj9ecricnkGI9CjkP5w5KDRxLCCZRl L0J72ZU4TstuD7M6vuDJtU X-Received: by 2002:a05:7022:128d:b0:11a:4016:4491 with SMTP id a92af1059eb24-124a00b881emr2439838c88.24.1769566563956; Tue, 27 Jan 2026 18:16:03 -0800 (PST) Received: from smtpclient.apple ([142.171.105.12]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-124a9cdcbcfsm865528c88.0.2026.01.27.18.16.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Jan 2026 18:16:03 -0800 (PST) From: Chao Li Message-Id: <075DECA0-5214-4794-A265-5A979E1A49B7@gmail.com> Content-Type: multipart/mixed; boundary="Apple-Mail=_AB40901F-5B2B-40DF-8517-E4363B358383" Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: tablecmds: reject CLUSTER ON for partitioned tables earlier Date: Wed, 28 Jan 2026 10:15:29 +0800 In-Reply-To: Cc: Postgres hackers To: Zsolt Parragi References: <07773235-2E94-478F-BEF6-38C73B0553B8@gmail.com> <16D5D52A-1B99-4371-982E-257C195D2924@gmail.com> <5244008D-79E1-484B-9407-21F5D388EC7F@gmail.com> X-Mailer: Apple Mail (2.3864.300.41.1.7) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --Apple-Mail=_AB40901F-5B2B-40DF-8517-E4363B358383 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Jan 27, 2026, at 16:55, Zsolt Parragi = wrote: >=20 >> I added two new test cases in 0002 that trigger the check. >=20 > I also tested these scenarios previously. It's good that they are part > of the test suite, but they don't hit that error path. Verified with > this: >=20 > diff --git a/src/backend/commands/tablecmds.c = b/src/backend/commands/tablecmds.c > index 379f4d4ebaf..50f80724cb3 100644 > --- a/src/backend/commands/tablecmds.c > +++ b/src/backend/commands/tablecmds.c > @@ -17857,9 +17857,7 @@ ATExecDropInherit(Relation rel, RangeVar > *parent, LOCKMODE lockmode) > Relation parent_rel; >=20 > if (rel->rd_rel->relispartition) > - ereport(ERROR, > - (errcode(ERRCODE_WRONG_OBJECT_TYPE), > - errmsg("cannot change inheritance of a partition"))); > + Assert(0); >=20 > /* > * AccessShareLock on the parent is probably enough, seeing that DROP Thank you so much for pointing out this, and sorry for misunderstanding = you. You are right, as the check has been added to = ATPrepChangeInherit(), the same check in ATExecDropInherit becomes = redundant. I thought you were talking about the check in = ATPrepChangeInherit(). PFA v7: * In 0001, replaced ereport with assert in mark_index_clustered(). See = my previous email for the analysis. * In 0002, removed the redundant check of relispartition from = ATExecDropInherit(). Best regards, -- Chao Li (Evan) HighGo Software Co., Ltd. https://www.highgo.com/ --Apple-Mail=_AB40901F-5B2B-40DF-8517-E4363B358383 Content-Disposition: attachment; filename=v7-0001-tablecmds-reject-CLUSTER-ON-for-partitioned-table.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="v7-0001-tablecmds-reject-CLUSTER-ON-for-partitioned-table.patch" Content-Transfer-Encoding: quoted-printable =46rom=2042ae05132151bc881f1e280bf4fff563a1ff2d37=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20"Chao=20Li=20(Evan)"=20=0A= Date:=20Wed,=2021=20Jan=202026=2011:27:03=20+0800=0ASubject:=20[PATCH=20= v7=201/2]=20tablecmds:=20reject=20CLUSTER=20ON=20for=20partitioned=20= tables=0A=20earlier=0A=0AALTER=20TABLE=20...=20CLUSTER=20ON=20and=20SET=20= WITHOUT=20CLUSTER=20are=20not=20supported=20for=0Apartitioned=20tables=20= and=20already=20fail=20today,=20but=20only=20at=20exec=20time.=0A=0A= Reject=20these=20commands=20earlier=20via=20ATSimplePermissions(),=20= matching=20the=0Ahandling=20of=20other=20unsupported=20ALTER=20TABLE=20= actions=20on=20partitioned=20tables=0A(such=20as=20SET=20LOGGED=20/=20= SET=20UNLOGGED).=20This=20centralizes=20the=20relation-kind=0Acheck=20in=20= the=20ALTER=20TABLE=20preparation=20phase,=20improving=20consistency=20= and=0Amaintainability.=0A=0AAs=20a=20result,=20partitioned=20tables=20= now=20report=20the=20standard=20ATSimplePermissions()=0Aerror=20for=20= unsupported=20ALTER=20TABLE=20actions.=0A=0AAlso,=20replace=20= ereport(ERROR)=20with=20an=20Assert()=20in=20mark_index_clustered(),=0A= because=20after=20this=20change=20no=20code=20path=20should=20call=20it=20= for=20a=20partitioned=20table.=0A=0AAuthor:=20Chao=20Li=20= =0AReviewed-by:=20Zsolt=20Parragi=20= =0ADiscussion:=20= https://postgr.es/m/CAEoWx2kggo1N2kDH6OSfXHL_5gKg3DqQ0PdNuL4LH4XSTKJ3-g@ma= il.gmail.com=0A---=0A=20src/backend/commands/cluster.c=20=20=20=20=20=20=20= =20|=207=20++-----=0A=20src/backend/commands/tablecmds.c=20=20=20=20=20=20= |=202=20+-=0A=20src/test/regress/expected/cluster.out=20|=206=20++++--=0A= =203=20files=20changed,=207=20insertions(+),=208=20deletions(-)=0A=0A= diff=20--git=20a/src/backend/commands/cluster.c=20= b/src/backend/commands/cluster.c=0Aindex=2060a4617a585..f9ee5a5ab60=20= 100644=0A---=20a/src/backend/commands/cluster.c=0A+++=20= b/src/backend/commands/cluster.c=0A@@=20-558,11=20+558,8=20@@=20= mark_index_clustered(Relation=20rel,=20Oid=20indexOid,=20bool=20= is_internal)=0A=20=09Relation=09pg_index;=0A=20=09ListCell=20=20=20= *index;=0A=20=0A-=09/*=20Disallow=20applying=20to=20a=20partitioned=20= table=20*/=0A-=09if=20(rel->rd_rel->relkind=20=3D=3D=20= RELKIND_PARTITIONED_TABLE)=0A-=09=09ereport(ERROR,=0A-=09=09=09=09= (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),=0A-=09=09=09=09=20= errmsg("cannot=20mark=20index=20clustered=20in=20partitioned=20= table")));=0A+=09/*=20This=20function=20is=20only=20valid=20for=20= non-partitioned=20tables=20*/=0A+=09Assert(rel->rd_rel->relkind=20!=3D=20= RELKIND_PARTITIONED_TABLE);=0A=20=0A=20=09/*=0A=20=09=20*=20If=20the=20= index=20is=20already=20marked=20clustered,=20no=20need=20to=20do=20= anything.=0Adiff=20--git=20a/src/backend/commands/tablecmds.c=20= b/src/backend/commands/tablecmds.c=0Aindex=20f976c0e5c7e..3e9f62e9d37=20= 100644=0A---=20a/src/backend/commands/tablecmds.c=0A+++=20= b/src/backend/commands/tablecmds.c=0A@@=20-5142,7=20+5142,7=20@@=20= ATPrepCmd(List=20**wqueue,=20Relation=20rel,=20AlterTableCmd=20*cmd,=0A=20= =09=09case=20AT_ClusterOn:=09=09/*=20CLUSTER=20ON=20*/=0A=20=09=09case=20= AT_DropCluster:=09/*=20SET=20WITHOUT=20CLUSTER=20*/=0A=20=09=09=09= ATSimplePermissions(cmd->subtype,=20rel,=0A-=09=09=09=09=09=09=09=09= ATT_TABLE=20|=20ATT_PARTITIONED_TABLE=20|=20ATT_MATVIEW);=0A+=09=09=09=09= =09=09=09=09ATT_TABLE=20|=20ATT_MATVIEW);=0A=20=09=09=09/*=20These=20= commands=20never=20recurse=20*/=0A=20=09=09=09/*=20No=20command-specific=20= prep=20needed=20*/=0A=20=09=09=09pass=20=3D=20AT_PASS_MISC;=0Adiff=20= --git=20a/src/test/regress/expected/cluster.out=20= b/src/test/regress/expected/cluster.out=0Aindex=20= 4d40a6809ab..07c52e647f7=20100644=0A---=20= a/src/test/regress/expected/cluster.out=0A+++=20= b/src/test/regress/expected/cluster.out=0A@@=20-492,9=20+492,11=20@@=20= Number=20of=20partitions:=203=20(Use=20\d+=20to=20list=20them.)=0A=20= CLUSTER=20clstrpart;=0A=20ERROR:=20=20there=20is=20no=20previously=20= clustered=20index=20for=20table=20"clstrpart"=0A=20ALTER=20TABLE=20= clstrpart=20SET=20WITHOUT=20CLUSTER;=0A-ERROR:=20=20cannot=20mark=20= index=20clustered=20in=20partitioned=20table=0A+ERROR:=20=20ALTER=20= action=20SET=20WITHOUT=20CLUSTER=20cannot=20be=20performed=20on=20= relation=20"clstrpart"=0A+DETAIL:=20=20This=20operation=20is=20not=20= supported=20for=20partitioned=20tables.=0A=20ALTER=20TABLE=20clstrpart=20= CLUSTER=20ON=20clstrpart_idx;=0A-ERROR:=20=20cannot=20mark=20index=20= clustered=20in=20partitioned=20table=0A+ERROR:=20=20ALTER=20action=20= CLUSTER=20ON=20cannot=20be=20performed=20on=20relation=20"clstrpart"=0A= +DETAIL:=20=20This=20operation=20is=20not=20supported=20for=20= partitioned=20tables.=0A=20DROP=20TABLE=20clstrpart;=0A=20--=20Ownership=20= of=20partitions=20is=20checked=0A=20CREATE=20TABLE=20ptnowner(i=20int=20= unique)=20PARTITION=20BY=20LIST=20(i);=0A--=20=0A2.50.1=20(Apple=20= Git-155)=0A=0A= --Apple-Mail=_AB40901F-5B2B-40DF-8517-E4363B358383 Content-Disposition: attachment; filename=v7-0002-tablecmds-reject-INHERIT-NO-INHERIT-for-partition.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="v7-0002-tablecmds-reject-INHERIT-NO-INHERIT-for-partition.patch" Content-Transfer-Encoding: quoted-printable =46rom=206300e04bda0ae3e7d633dae94c63f35acfdea70a=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20"Chao=20Li=20(Evan)"=20=0A= Date:=20Thu,=2022=20Jan=202026=2016:47:58=20+0800=0ASubject:=20[PATCH=20= v7=202/2]=20tablecmds:=20reject=20INHERIT=20/=20NO=20INHERIT=20for=20= partitioned=0A=20tables=20earlier=0A=0AALTER=20TABLE=20...=20INHERIT=20= and=20NO=20INHERIT=20are=20not=20supported=20for=20partitioned=0Atables=20= and=20already=20fail=20today,=20but=20only=20via=20ad-hoc=20checks=20in=20= command-=0Aspecific=20preparation=20code=20or=20later=20at=20execution=20= time.=0A=0AReject=20these=20commands=20earlier=20via=20= ATSimplePermissions(),=20matching=20the=0Ahandling=20of=20other=20= unsupported=20ALTER=20TABLE=20actions=20on=20partitioned=20tables.=0A= This=20centralizes=20relation-kind=20checks=20in=20the=20common=20= permission=20framework=0Aand=20produces=20the=20standard,=20consistent=20= error=20message.=0A=0AWhile=20doing=20this,=20fix=20two=20related=20= issues=20in=20the=20preparation=20logic:=0A-=20The=20header=20comment=20= of=20ATPrepAddInherit=20was=20a=20stale=20copy-paste=20that=0A=20=20= described=20behavior=20no=20longer=20implemented=20there.=0A-=20NO=20= INHERIT=20previously=20didn't=20use=20ATPrepAddInherit,=20causing=20it=20= to=20reach=0A=20=20execution-time=20checks=20unnecessarily.=20= Consolidate=20preparation=20into=20a=0A=20=20shared=20helper=20used=20by=20= both=20INHERIT=20and=20NO=20INHERIT,=20ensuring=20both=20are=0A=20=20= rejected=20uniformly=20and=20as=20early=20as=20possible.=0A=0AAuthor:=20= Chao=20Li=20=0AReviewed-by:=20Zsolt=20Parragi=20= =0ADiscussion:=20= https://postgr.es/m/CAEoWx2kggo1N2kDH6OSfXHL_5gKg3DqQ0PdNuL4LH4XSTKJ3-g@ma= il.gmail.com=0A---=0A=20src/backend/commands/tablecmds.c=20=20=20=20=20=20= =20=20=20=20|=2036=20++++++++++-------------=0A=20= src/test/regress/expected/alter_table.out=20|=2015=20++++++++--=0A=20= src/test/regress/sql/alter_table.sql=20=20=20=20=20=20|=20=208=20+++--=0A= =203=20files=20changed,=2034=20insertions(+),=2025=20deletions(-)=0A=0A= diff=20--git=20a/src/backend/commands/tablecmds.c=20= b/src/backend/commands/tablecmds.c=0Aindex=203e9f62e9d37..17dd94d6017=20= 100644=0A---=20a/src/backend/commands/tablecmds.c=0A+++=20= b/src/backend/commands/tablecmds.c=0A@@=20-686,7=20+686,7=20@@=20static=20= void=20ATExecEnableDisableTrigger(Relation=20rel,=20const=20char=20= *trigname,=0A=20=09=09=09=09=09=09=09=09=09=20=20=20LOCKMODE=20= lockmode);=0A=20static=20void=20ATExecEnableDisableRule(Relation=20rel,=20= const=20char=20*rulename,=0A=20=09=09=09=09=09=09=09=09=09char=20= fires_when,=20LOCKMODE=20lockmode);=0A-static=20void=20= ATPrepAddInherit(Relation=20child_rel);=0A+static=20void=20= ATPrepChangeInherit(Relation=20child_rel);=0A=20static=20ObjectAddress=20= ATExecAddInherit(Relation=20child_rel,=20RangeVar=20*parent,=20LOCKMODE=20= lockmode);=0A=20static=20ObjectAddress=20ATExecDropInherit(Relation=20= rel,=20RangeVar=20*parent,=20LOCKMODE=20lockmode);=0A=20static=20void=20= drop_parent_dependency(Oid=20relid,=20Oid=20refclassid,=20Oid=20= refobjid,=0A@@=20-5194,16=20+5194,16=20@@=20ATPrepCmd(List=20**wqueue,=20= Relation=20rel,=20AlterTableCmd=20*cmd,=0A=20=09=09=09break;=0A=20=09=09= case=20AT_AddInherit:=09=09/*=20INHERIT=20*/=0A=20=09=09=09= ATSimplePermissions(cmd->subtype,=20rel,=0A-=09=09=09=09=09=09=09=09= ATT_TABLE=20|=20ATT_PARTITIONED_TABLE=20|=20ATT_FOREIGN_TABLE);=0A+=09=09= =09=09=09=09=09=09ATT_TABLE=20|=20ATT_FOREIGN_TABLE);=0A=20=09=09=09/*=20= This=20command=20never=20recurses=20*/=0A-=09=09=09= ATPrepAddInherit(rel);=0A+=09=09=09ATPrepChangeInherit(rel);=0A=20=09=09=09= pass=20=3D=20AT_PASS_MISC;=0A=20=09=09=09break;=0A=20=09=09case=20= AT_DropInherit:=09/*=20NO=20INHERIT=20*/=0A=20=09=09=09= ATSimplePermissions(cmd->subtype,=20rel,=0A-=09=09=09=09=09=09=09=09= ATT_TABLE=20|=20ATT_PARTITIONED_TABLE=20|=20ATT_FOREIGN_TABLE);=0A+=09=09= =09=09=09=09=09=09ATT_TABLE=20|=20ATT_FOREIGN_TABLE);=0A=20=09=09=09/*=20= This=20command=20never=20recurses=20*/=0A-=09=09=09/*=20No=20= command-specific=20prep=20needed=20*/=0A+=09=09=09= ATPrepChangeInherit(rel);=0A=20=09=09=09pass=20=3D=20AT_PASS_MISC;=0A=20=09= =09=09break;=0A=20=09=09case=20AT_AlterConstraint:=09/*=20ALTER=20= CONSTRAINT=20*/=0A@@=20-17259,14=20+17259,14=20@@=20= ATExecEnableDisableRule(Relation=20rel,=20const=20char=20*rulename,=0A=20= }=0A=20=0A=20/*=0A-=20*=20ALTER=20TABLE=20INHERIT=0A+=20*=20Prepare=20to=20= change=20inheritance.=0A=20=20*=0A-=20*=20Add=20a=20parent=20to=20the=20= child's=20parents.=20This=20verifies=20that=20all=20the=20columns=20and=0A= -=20*=20check=20constraints=20of=20the=20parent=20appear=20in=20the=20= child=20and=20that=20they=20have=20the=0A-=20*=20same=20data=20types=20= and=20expressions.=0A+=20*=20A=20child=20table=20cannot=20be=20a=20typed=20= table=20or=20a=20partition.=20We=20don't=20need=20to=20check=0A+=20*=20= partitioned=20table=20here,=20because=20it=20has=20been=20blocked=20by=20= ATSimplePermissions=20in=0A+=20*=20ATPrepCmd.=0A=20=20*/=0A=20static=20= void=0A-ATPrepAddInherit(Relation=20child_rel)=0A= +ATPrepChangeInherit(Relation=20child_rel)=0A=20{=0A=20=09if=20= (child_rel->rd_rel->reloftype)=0A=20=09=09ereport(ERROR,=0A@@=20= -17277,14=20+17277,15=20@@=20ATPrepAddInherit(Relation=20child_rel)=0A=20= =09=09ereport(ERROR,=0A=20=09=09=09=09= (errcode(ERRCODE_WRONG_OBJECT_TYPE),=0A=20=09=09=09=09=20errmsg("cannot=20= change=20inheritance=20of=20a=20partition")));=0A-=0A-=09if=20= (child_rel->rd_rel->relkind=20=3D=3D=20RELKIND_PARTITIONED_TABLE)=0A-=09=09= ereport(ERROR,=0A-=09=09=09=09(errcode(ERRCODE_WRONG_OBJECT_TYPE),=0A-=09= =09=09=09=20errmsg("cannot=20change=20inheritance=20of=20partitioned=20= table")));=0A=20}=0A=20=0A=20/*=0A+=20*=20ALTER=20TABLE=20INHERIT=0A+=20= *=0A+=20*=20Add=20a=20parent=20to=20the=20child's=20parents.=20This=20= verifies=20that=20all=20the=20columns=20and=0A+=20*=20check=20= constraints=20of=20the=20parent=20appear=20in=20the=20child=20and=20that=20= they=20have=20the=0A+=20*=20same=20data=20types=20and=20expressions.=0A+=20= *=0A=20=20*=20Return=20the=20address=20of=20the=20new=20parent=20= relation.=0A=20=20*/=0A=20static=20ObjectAddress=0A@@=20-17855,11=20= +17856,6=20@@=20ATExecDropInherit(Relation=20rel,=20RangeVar=20*parent,=20= LOCKMODE=20lockmode)=0A=20=09ObjectAddress=20address;=0A=20=09Relation=09= parent_rel;=0A=20=0A-=09if=20(rel->rd_rel->relispartition)=0A-=09=09= ereport(ERROR,=0A-=09=09=09=09(errcode(ERRCODE_WRONG_OBJECT_TYPE),=0A-=09= =09=09=09=20errmsg("cannot=20change=20inheritance=20of=20a=20= partition")));=0A-=0A=20=09/*=0A=20=09=20*=20AccessShareLock=20on=20the=20= parent=20is=20probably=20enough,=20seeing=20that=20DROP=0A=20=09=20*=20= TABLE=20doesn't=20lock=20parent=20tables=20at=20all.=20=20We=20need=20= some=20lock=20since=20we'll=0Adiff=20--git=20= a/src/test/regress/expected/alter_table.out=20= b/src/test/regress/expected/alter_table.out=0Aindex=20= ac1a7345d0f..27b3518f94c=20100644=0A---=20= a/src/test/regress/expected/alter_table.out=0A+++=20= b/src/test/regress/expected/alter_table.out=0A@@=20-3997,10=20+3997,19=20= @@=20CREATE=20TABLE=20nonpartitioned=20(=0A=20=09a=20int,=0A=20=09b=20= int=0A=20);=0A-ALTER=20TABLE=20partitioned=20INHERIT=20nonpartitioned;=0A= -ERROR:=20=20cannot=20change=20inheritance=20of=20partitioned=20table=0A= -ALTER=20TABLE=20nonpartitioned=20INHERIT=20partitioned;=0A+ALTER=20= TABLE=20partitioned=20INHERIT=20nonpartitioned;=20--=20fail=0A+ERROR:=20=20= ALTER=20action=20INHERIT=20cannot=20be=20performed=20on=20relation=20= "partitioned"=0A+DETAIL:=20=20This=20operation=20is=20not=20supported=20= for=20partitioned=20tables.=0A+ALTER=20TABLE=20partitioned=20NO=20= INHERIT=20nonpartitioned;=20--=20fail=0A+ERROR:=20=20ALTER=20action=20NO=20= INHERIT=20cannot=20be=20performed=20on=20relation=20"partitioned"=0A= +DETAIL:=20=20This=20operation=20is=20not=20supported=20for=20= partitioned=20tables.=0A+ALTER=20TABLE=20nonpartitioned=20INHERIT=20= partitioned;=20--=20fail=0A=20ERROR:=20=20cannot=20inherit=20from=20= partitioned=20table=20"partitioned"=0A+CREATE=20TABLE=20partitioned_p1=20= PARTITION=20OF=20partitioned=20FOR=20VALUES=20FROM=20(0,=200)=20TO=20= (10,=20100);=0A+ALTER=20TABLE=20partitioned_p1=20INHERIT=20= nonpartitioned;=20--=20fail=0A+ERROR:=20=20cannot=20change=20inheritance=20= of=20a=20partition=0A+ALTER=20TABLE=20partitioned_p1=20NO=20INHERIT=20= nonpartitioned;=20--=20fail=0A+ERROR:=20=20cannot=20change=20inheritance=20= of=20a=20partition=0A=20--=20cannot=20add=20NO=20INHERIT=20constraint=20= to=20partitioned=20tables=0A=20ALTER=20TABLE=20partitioned=20ADD=20= CONSTRAINT=20chk_a=20CHECK=20(a=20>=200)=20NO=20INHERIT;=0A=20ERROR:=20=20= cannot=20add=20NO=20INHERIT=20constraint=20to=20partitioned=20table=20= "partitioned"=0Adiff=20--git=20a/src/test/regress/sql/alter_table.sql=20= b/src/test/regress/sql/alter_table.sql=0Aindex=20= 417202430a5..24936ecdd34=20100644=0A---=20= a/src/test/regress/sql/alter_table.sql=0A+++=20= b/src/test/regress/sql/alter_table.sql=0A@@=20-2397,8=20+2397,12=20@@=20= CREATE=20TABLE=20nonpartitioned=20(=0A=20=09a=20int,=0A=20=09b=20int=0A=20= );=0A-ALTER=20TABLE=20partitioned=20INHERIT=20nonpartitioned;=0A-ALTER=20= TABLE=20nonpartitioned=20INHERIT=20partitioned;=0A+ALTER=20TABLE=20= partitioned=20INHERIT=20nonpartitioned;=20--=20fail=0A+ALTER=20TABLE=20= partitioned=20NO=20INHERIT=20nonpartitioned;=20--=20fail=0A+ALTER=20= TABLE=20nonpartitioned=20INHERIT=20partitioned;=20--=20fail=0A+CREATE=20= TABLE=20partitioned_p1=20PARTITION=20OF=20partitioned=20FOR=20VALUES=20= FROM=20(0,=200)=20TO=20(10,=20100);=0A+ALTER=20TABLE=20partitioned_p1=20= INHERIT=20nonpartitioned;=20--=20fail=0A+ALTER=20TABLE=20partitioned_p1=20= NO=20INHERIT=20nonpartitioned;=20--=20fail=0A=20=0A=20--=20cannot=20add=20= NO=20INHERIT=20constraint=20to=20partitioned=20tables=0A=20ALTER=20TABLE=20= partitioned=20ADD=20CONSTRAINT=20chk_a=20CHECK=20(a=20>=200)=20NO=20= INHERIT;=0A--=20=0A2.50.1=20(Apple=20Git-155)=0A=0A= --Apple-Mail=_AB40901F-5B2B-40DF-8517-E4363B358383--