Tarantool development patches archive
 help / color / mirror / Atom feed
From: Nikita Pettik <korablev@tarantool.org>
To: Chris Sosnin <k.sosnin@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH] sql: allow accessing list of collations via pragma
Date: Wed, 15 Jan 2020 19:56:21 +0300	[thread overview]
Message-ID: <20200115165621.GB82780@tarantool.org> (raw)
In-Reply-To: <20200110075217.68276-1-k.sosnin@tarantool.org>

On 10 Jan 10:52, Chris Sosnin wrote:
> 'pragma collation_list' uses _collation space, although user
> may have no access to it. Thus, we replace it with the
> corresponding view.
> 
> Closes #4713
> ---
> branch: https://github.com/tarantool/tarantool/tree/ksosnin/gh-4713-pragma-collation-list
> issue: https://github.com/tarantool/tarantool/issues/4713
> 
>  src/box/sql/pragma.c        |   2 +-
>  test/sql/collation.result   | 286 +++++++++++++++++++++++++++++++++++-
>  test/sql/collation.test.lua |   1 -
>  3 files changed, 284 insertions(+), 5 deletions(-)
> 
> diff --git a/src/box/sql/pragma.c b/src/box/sql/pragma.c
> index 28ba64500..636f519ef 100644
> --- a/src/box/sql/pragma.c
> +++ b/src/box/sql/pragma.c
> @@ -241,7 +241,7 @@ sql_pragma_collation_list(struct Parse *parse_context)
>  	char key_buf[16];
>  	char *key_end = mp_encode_array(key_buf, 0);
>  	box_tuple_t *tuple;
> -	box_iterator_t *it = box_index_iterator(BOX_COLLATION_ID, 0, ITER_ALL,
> +	box_iterator_t *it = box_index_iterator(BOX_VCOLLATION_ID, 0, ITER_ALL,
>  						key_buf, key_end);
>  	if (it == NULL) {
>  		parse_context->is_aborted = true;
> diff --git a/test/sql/collation.result b/test/sql/collation.result
> index 4e43a7cb7..924ac424c 100644
> --- a/test/sql/collation.result
> +++ b/test/sql/collation.result
> @@ -360,11 +360,291 @@ box.schema.user.create('tmp')
>  box.session.su('tmp')
>  ---
>  ...
> --- Error: read access to space is denied.
>  box.execute("pragma collation_list")
>  ---
> -- null
> -- Read access to space '_collation' is denied for user 'tmp'
> +- metadata:
> +  - name: seq
> +    type: integer
> +  - name: name
> +    type: text
> +  rows:
> 
> //snipped 276 rows

Please, never truncate output of format-patch. At least when you
send patch for the first review iteration.

Content returned by 'pragma collation_list' is already verified in
sql-tap/collation.test.lua. So I guess it is enough to check that
box.execute("pragma collation_list") does not throw an error.

> diff --git a/test/sql/collation.test.lua b/test/sql/collation.test.lua
> index 9a2042c09..cbe6e7799 100644
> --- a/test/sql/collation.test.lua
> +++ b/test/sql/collation.test.lua
> @@ -103,7 +103,6 @@ box.schema.user.revoke('guest', 'read,write,execute', 'universe')
>  -- gh-3857 "PRAGMA collation_list" invokes segmentation fault.
>  box.schema.user.create('tmp')
>  box.session.su('tmp')
> --- Error: read access to space is denied.
>  box.execute("pragma collation_list")
>  box.session.su('admin')
>  box.schema.user.drop('tmp')
> -- 
> 2.21.0 (Apple Git-122.2)
> 

  reply	other threads:[~2020-01-15 16:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-10  7:52 Chris Sosnin
2020-01-15 16:56 ` Nikita Pettik [this message]
2020-01-16  8:41   ` Chris Sosnin
2020-01-17 19:15     ` Nikita Pettik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200115165621.GB82780@tarantool.org \
    --to=korablev@tarantool.org \
    --cc=k.sosnin@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH] sql: allow accessing list of collations via pragma' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox