From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id EB18925365 for ; Fri, 19 Jul 2019 04:38:38 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ACEF0BDHATpK for ; Fri, 19 Jul 2019 04:38:38 -0400 (EDT) Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 5D3C225363 for ; Fri, 19 Jul 2019 04:38:38 -0400 (EDT) From: imeevma@tarantool.org Subject: [tarantool-patches] [PATCH v1 1/1] sql: increase row_count when adding CHECK constraint Date: Fri, 19 Jul 2019 11:38:35 +0300 Message-Id: <5dba4410ecdc97004cd4a9890e302baa20b07529.1563525363.git.imeevma@gmail.com> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: korablev@tarantool.org Cc: tarantool-patches@freelists.org If a CHECK constraint was added using an ALTER TABLE statement, row_count should be increased. Note that row_count does not increase if a CHECK constraint is added during the execution of a CREATE TABLE statement. For example: box.execute('CREATE TABLE t1(id INTEGER PRIMARY KEY);') box.execute('ALTER TABLE t1 ADD CONSTRAINT ck1 CHECK(id > 0);') Should return: - row_count: 1 However it was '0' before the patch. Closes #4363 --- https://github.com/tarantool/tarantool/issues/4363 https://github.com/tarantool/tarantool/tree/imeevma/gh-4363-increase-row_count-on-alter-table src/box/sql/build.c | 8 ++++++++ test/sql/row-count.result | 16 ++++++++++++++++ test/sql/row-count.test.lua | 7 +++++++ 3 files changed, 31 insertions(+) diff --git a/src/box/sql/build.c b/src/box/sql/build.c index 2aefa2a..183f875 100644 --- a/src/box/sql/build.c +++ b/src/box/sql/build.c @@ -1124,6 +1124,14 @@ vdbe_emit_ck_constraint_create(struct Parse *parser, return; sqlVdbeAddOp3(v, OP_SInsert, BOX_CK_CONSTRAINT_ID, 0, ck_constraint_reg + 5); + /* + * In case constraint was added using ALTER TABLE + * statement we should increase row_count. + */ + if (parser->create_table_def.new_space == NULL) { + sqlVdbeCountChanges(v); + sqlVdbeChangeP5(v, OPFLAG_NCHANGE); + } save_record(parser, BOX_CK_CONSTRAINT_ID, ck_constraint_reg, 2, v->nOp - 1, true); VdbeComment((v, "Create CK constraint %s", ck_def->name)); diff --git a/test/sql/row-count.result b/test/sql/row-count.result index e7841ca..fcea2cf 100644 --- a/test/sql/row-count.result +++ b/test/sql/row-count.result @@ -335,3 +335,19 @@ box.execute("DROP TABLE t1;") --- - row_count: 1 ... +-- +-- gh-4363: make sure that row_count has increased in the case of +-- ALTER TABLE ADD CONSTRAINT CHECK(); +-- +box.execute('CREATE TABLE t1(id INTEGER PRIMARY KEY);') +--- +- row_count: 1 +... +box.execute('ALTER TABLE t1 ADD CONSTRAINT ck1 CHECK(id > 0);') +--- +- row_count: 1 +... +box.execute('DROP TABLE t1;') +--- +- row_count: 1 +... diff --git a/test/sql/row-count.test.lua b/test/sql/row-count.test.lua index 9f5215c..7b43db7 100644 --- a/test/sql/row-count.test.lua +++ b/test/sql/row-count.test.lua @@ -73,3 +73,10 @@ box.execute("DROP TABLE t2;") box.execute("DROP TABLE t3;") box.execute("DROP TABLE t1;") +-- +-- gh-4363: make sure that row_count has increased in the case of +-- ALTER TABLE
ADD CONSTRAINT CHECK(); +-- +box.execute('CREATE TABLE t1(id INTEGER PRIMARY KEY);') +box.execute('ALTER TABLE t1 ADD CONSTRAINT ck1 CHECK(id > 0);') +box.execute('DROP TABLE t1;') -- 2.7.4