From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tarantool-patches-bounce@freelists.org>
Received: from localhost (localhost [127.0.0.1])
	by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 7BFB825EEF
	for <tarantool-patches@freelists.org>; Wed, 16 Jan 2019 15:54:18 -0500 (EST)
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 p8o4V0ybVEiq for <tarantool-patches@freelists.org>;
	Wed, 16 Jan 2019 15:54:18 -0500 (EST)
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 37CAA251B9
	for <tarantool-patches@freelists.org>; Wed, 16 Jan 2019 15:54:18 -0500 (EST)
Subject: [tarantool-patches] Re: [PATCH 6/6] sql: introduce ALTER TABLE
 ADD CONSTRAINT UNIQUE/PRIMARY KEY
References: <cover.1547035183.git.korablev@tarantool.org>
 <5b411f9988366aee0418ed4aeb01243a85cfbd03.1547035184.git.korablev@tarantool.org>
 <3804c32a-4e68-d876-b811-119ff669852b@tarantool.org>
 <A57AFCB3-F2AF-4FD5-BFD7-2DE0DBE1719A@tarantool.org>
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Message-ID: <713cc1b5-1a1e-31f0-4ad7-e78571ee4d26@tarantool.org>
Date: Wed, 16 Jan 2019 23:54:07 +0300
MIME-Version: 1.0
In-Reply-To: <A57AFCB3-F2AF-4FD5-BFD7-2DE0DBE1719A@tarantool.org>
Content-Type: text/plain; charset="utf-8"; format="flowed"
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Sender: tarantool-patches-bounce@freelists.org
Errors-to: tarantool-patches-bounce@freelists.org
Reply-To: tarantool-patches@freelists.org
List-help: <mailto:ecartis@freelists.org?Subject=help>
List-unsubscribe: <tarantool-patches-request@freelists.org?Subject=unsubscribe>
List-software: Ecartis version 1.0.0
List-Id: tarantool-patches <tarantool-patches.freelists.org>
List-subscribe: <tarantool-patches-request@freelists.org?Subject=subscribe>
List-owner: <mailto:>
List-post: <mailto:tarantool-patches@freelists.org>
List-archive: <http://www.freelists.org/archives/tarantool-patches>
To: "n.pettik" <korablev@tarantool.org>, tarantool-patches@freelists.org


>>> +	sqlite3VdbeAddOp2(v, OP_Integer, space_id, tmp_reg);
>>> +	int found_addr = sqlite3VdbeAddOp4Int(v, OP_NotFound, cursor, 0,
>>> +					     tmp_reg, 1);
>>> +	sqlite3VdbeAddOp4(v, OP_Halt, SQLITE_ERROR, ON_CONFLICT_ACTION_FAIL, 0,
>>> +			  "multiple primary keys are not allowed", P4_STATIC);
>>> +	sqlite3VdbeJumpHere(v, found_addr);
>>> +}
>>> +
>>>   /**
>>>    * Add new index to table's indexes list.
>>>    * We follow convention that PK comes first in list.
>>> diff --git a/test/sql-tap/alter.test.lua b/test/sql-tap/alter.test.lua
>>> index 1aad555c0..925753749 100755
>>> --- a/test/sql-tap/alter.test.lua
>>> +++ b/test/sql-tap/alter.test.lua
>>> @@ -517,6 +517,62 @@ test:do_catchsql_test(
>>>           -- </alter-7.11>
>>>       })
>>>   +test:do_test(
>>> +    "alter-8.1.0",
>>> +    function()
>>> +        format = {}
>>> +        format[1] = { name = 'id', type = 'scalar'}
>>> +        format[2] = { name = 'f2', type = 'scalar'}
>>> +        s = box.schema.create_space('T', {format = format})
>>> +    end,
>>> +    {})
>>> +
>>> +test:do_catchsql_test(
>>> +    "alter-8.1.1",
>>> +    [[
>>> +        ALTER TABLE t ADD CONSTRAINT pk PRIMARY KEY("id");
>>> +    ]], {
>>> +        0
>>> +    })
>>> +
>>> +test:do_test(
>>> +    "alter-8.1.2",
>>> +    function()
>>> +        i = box.space.T.index[0]
>>> +        return i.id
>>
>> 3. Why not return box.space.T.index[0].id?
> 
> …

I know, nit, but I do not like excess useless lines. Cuts the eye, sorry.

> 
> diff --git a/test/sql-tap/alter.test.lua b/test/sql-tap/alter.test.lua
> index 925753749..318b0f68d 100755
> --- a/test/sql-tap/alter.test.lua
> +++ b/test/sql-tap/alter.test.lua
> @@ -538,8 +538,7 @@ test:do_catchsql_test(
>   test:do_test(
>       "alter-8.1.2",
>       function()
> -        i = box.space.T.index[0]
> -        return i.id
> +        return box.space.T.index[0].id
>       end, 0)
> 
>