MIME-Version: 1.0
References: 
 <171085360143.2046436.7217841141682511557.pgcf@coridan.postgresql.org>
 <7fdaf3e8-4c05-4739-bee6-98acc068d1c7@postgrespro.ru>
 <CAPpHfduH83+CW1dBppFVjxauPFGC+-ux+Y7wB0koZJCs029SXA@mail.gmail.com>
 <4433b492-9e97-4334-96d9-ddaaa5083099@postgrespro.ru>
 <CACJufxEi_JVg+=_BSS0o+TYUE_Hq+jmga_yxxuKLSGbQiAnZDg@mail.gmail.com>
 <67ecf5fb-e63d-4284-be75-d0479eef81aa@postgrespro.ru>
 <CACJufxFGPLTDW55bgaBTH1uCf0=YUZUVKWFrTBvOZNYKc49MxA@mail.gmail.com>
 <CACJufxHHnJm6Jb2YQpuRU1RX__tO=JJNJ5=EUMuzif_KNxGd9A@mail.gmail.com>
 <CACJufxFkscyhak2cSr8t+EPfwv11yccfEZBBnPbX4tRc_mWkXQ@mail.gmail.com>
 <884bcf9e-d6e3-4b0c-8dcb-7f2110070ac9@postgrespro.ru>
 <CACJufxHRX6xQtzn+KenK3SDR2+4kUpVnO+0axforV_pohwMnFw@mail.gmail.com>
 <1e74c9fd-830e-4544-b0de-e49ea4b04029@postgrespro.ru>
 <CACJufxHNvb6PpeGDEkzZMnKHjZrQGBHRUENKb2AwZ4N3Q8G3fg@mail.gmail.com>
 <9c1b75f1-5c40-4a86-9a61-a4b3f1d7ec60@postgrespro.ru>
 <CACJufxE6mU7Za2X5Z4Cs9jEmgfjTYPy_ChiVXND5ZEZ3xM665g@mail.gmail.com>
 <7e1c67b8-ceba-4a04-964a-853eedeb02cc@postgrespro.ru>
 <CACJufxHakPGgUHfe4uThY2u_Hzq3YOP9m4B3gjZUTUm2mbVryA@mail.gmail.com>
In-Reply-To: 
 <CACJufxHakPGgUHfe4uThY2u_Hzq3YOP9m4B3gjZUTUm2mbVryA@mail.gmail.com>
From: jian he <jian.universality@gmail.com>
Date: Mon, 16 Jun 2025 17:33:52 +0800
Message-ID: 
 <CACJufxHo0u=PzgCn88VZEW0mtB=JopchqBTESudUMH+HCyiTpg@mail.gmail.com>
Subject: Re: Add SPLIT PARTITION/MERGE PARTITIONS commands
To: Dmitry Koval <d.koval@postgrespro.ru>
Cc: pgsql-hackers@lists.postgresql.org
Content-Type: multipart/mixed; boundary="000000000000449fa50637ad1a5b"
Archived-At: 
 <https://www.postgresql.org/message-id/CACJufxHo0u%3DPzgCn88VZEW0mtB%3DJopchqBTESudUMH%2BHCyiTpg%40mail.gmail.com>
Precedence: bulk

--000000000000449fa50637ad1a5b
Content-Type: text/plain; charset="UTF-8"

for v45.

+ foreach_ptr(CookedConstraint, ccon, cookedConstraints)
+ {
+ if (!ccon->skip_validation && ccon->contype == CONSTR_CHECK)
+ {
+ Bitmapset  *attnums = NULL;
+
+ pull_varattnos((Node *) ccon->expr, 1, &attnums);
+
+ /*
+ * Add check only if it contains tableoid
+ * (TableOidAttributeNumber).
+ */
+ if (bms_is_member(TableOidAttributeNumber -
FirstLowInvalidHeapAttributeNumber,
+  attnums))
+ {
+ NewConstraint *newcon;
+
+ newcon = (NewConstraint *) palloc0(sizeof(NewConstraint));
+ newcon->name = ccon->name;
+ newcon->contype = ccon->contype;
+ newcon->qual = ccon->expr;
+
+ tab->constraints = lappend(tab->constraints, newcon);
+ }
+ }
+ }

we need to expand the virtual generated column here,
otherwise, bms_is_member would  be not correct.
consider case like:

CREATE TABLE pp (f1 INT, f2 INT generated always as (f1 +
tableoid::int)) PARTITION BY RANGE (f1);
CREATE TABLE pp_1 (f2 INT generated always as (f1 + tableoid::int), f1 int);
ALTER TABLE pp ATTACH PARTITION pp_1 FOR VALUES FROM (-1) TO (10);
CREATE TABLE pp_2 (f2 INT generated always as (f1 + tableoid::int), f1 int);
ALTER TABLE pp ATTACH PARTITION pp_2 FOR VALUES FROM (10) TO (20);
ALTER TABLE PP add check (f2 > 0);

ALTER TABLE pp MERGE PARTITIONS (pp_1, pp_2) INTO pp_12;

In this context, the merge partition command  needs to evaluate the constraint
"pp_f2_check" again on pp_12.

attach minor diff fix this problem.

--000000000000449fa50637ad1a5b
Content-Type: application/octet-stream;
	name="check_constraint_if_it_contains_tableoid.no-cfbot"
Content-Disposition: attachment;
	filename="check_constraint_if_it_contains_tableoid.no-cfbot"
Content-Transfer-Encoding: base64
Content-ID: <f_mbywd6qa0>
X-Attachment-Id: f_mbywd6qa0

ZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL2NvbW1hbmRzL3RhYmxlY21kcy5jIGIvc3JjL2JhY2tl
bmQvY29tbWFuZHMvdGFibGVjbWRzLmMKaW5kZXggN2U3NzAzYzc5OTcuLjE3OWVhYjEwYzg0IDEw
MDY0NAotLS0gYS9zcmMvYmFja2VuZC9jb21tYW5kcy90YWJsZWNtZHMuYworKysgYi9zcmMvYmFj
a2VuZC9jb21tYW5kcy90YWJsZWNtZHMuYwpAQCAtMjIzNjcsMTYgKzIyMzY3LDE3IEBAIGNyZWF0
ZVRhYmxlQ29uc3RyYWludHMoTGlzdCAqKndxdWV1ZSwgQWx0ZXJlZFRhYmxlSW5mbyAqdGFiLAog
CSAqIG1vZGVsUmVsIGNoZWNrIGNvbnN0cmFpbnQgZXhwcmVzc3Npb24gbWF5IHJlZmVyZW5jZSB0
YWJsZW9pZCwgc28gbGF0ZXIgaW4KIAkgKiBtb3ZlTWVyZ2VkVGFibGVzUm93cywgd2UgbmVlZCBl
dnVsYXRlIHRoZSBjaGVjayBjb25zdHJhaW50IGFnYWluIGZvciB0aGUKIAkgKiBuZXdSZWwuIFdl
IGNhbiBjaGVjayB3ZWF0aGVyIGNoZWNrIGNvbnN0cmFpbnQgY29udGFpbiB0YWJsZW9pZCByZWZl
cmVuY2UKLQkgKiBvciBub3QgdmlhIHB1bGxfdmFyYXR0bm9zLiBCdXQgdW5jb25kaXRpb25hbHkg
cmV2YXVsYXRlIGNoZWNrIGNvc250cmFpbnQKLQkgKiBzZWVtcyBtb3JlIHNhZmUuCisJICogb3Ig
bm90IHZpYSBwdWxsX3ZhcmF0dG5vcy4KIAkqLwogCWZvcmVhY2hfcHRyKENvb2tlZENvbnN0cmFp
bnQsIGNjb24sIGNvb2tlZENvbnN0cmFpbnRzKQogCXsKIAkJaWYgKCFjY29uLT5za2lwX3ZhbGlk
YXRpb24gJiYgY2Nvbi0+Y29udHlwZSA9PSBDT05TVFJfQ0hFQ0spCiAJCXsKKwkJCU5vZGUJCSpx
dWFsOwogCQkJQml0bWFwc2V0CSAgKmF0dG51bXMgPSBOVUxMOwogCi0JCQlwdWxsX3ZhcmF0dG5v
cygoTm9kZSAqKSBjY29uLT5leHByLCAxLCAmYXR0bnVtcyk7CisJCQlxdWFsID0gZXhwYW5kX2dl
bmVyYXRlZF9jb2x1bW5zX2luX2V4cHIoY2Nvbi0+ZXhwciwgbmV3UmVsLCAxKTsKKwkJCXB1bGxf
dmFyYXR0bm9zKHF1YWwsIDEsICZhdHRudW1zKTsKIAogCQkJLyoKIAkJCSAqIEFkZCBjaGVjayBv
bmx5IGlmIGl0IGNvbnRhaW5zIHRhYmxlb2lkCkBAIC0yMjM5MCw3ICsyMjM5MSw3IEBAIGNyZWF0
ZVRhYmxlQ29uc3RyYWludHMoTGlzdCAqKndxdWV1ZSwgQWx0ZXJlZFRhYmxlSW5mbyAqdGFiLAog
CQkJCW5ld2NvbiA9IChOZXdDb25zdHJhaW50ICopIHBhbGxvYzAoc2l6ZW9mKE5ld0NvbnN0cmFp
bnQpKTsKIAkJCQluZXdjb24tPm5hbWUgPSBjY29uLT5uYW1lOwogCQkJCW5ld2Nvbi0+Y29udHlw
ZSA9IGNjb24tPmNvbnR5cGU7Ci0JCQkJbmV3Y29uLT5xdWFsID0gY2Nvbi0+ZXhwcjsKKwkJCQlu
ZXdjb24tPnF1YWwgPSBxdWFsOwogCiAJCQkJdGFiLT5jb25zdHJhaW50cyA9IGxhcHBlbmQodGFi
LT5jb25zdHJhaW50cywgbmV3Y29uKTsKIAkJCX0K
--000000000000449fa50637ad1a5b--