From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
To: tarantool-patches@freelists.org, "Мерген Имеев" <imeevma@tarantool.org>
Subject: [tarantool-patches] Re: [PATCH v2 1/1] sql: COLLATE after LIMIT throws an error
Date: Mon, 21 May 2018 18:27:34 +0300 [thread overview]
Message-ID: <f123807c-1f14-b0e7-a7ec-345cf9c431ea@tarantool.org> (raw)
In-Reply-To: <1526915797.481599602@f468.i.mail.ru>
Thanks a lot!
But please, apply this diff:
diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index 7a7728992..0b610dca7 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -1994,8 +1994,10 @@ computeLimitRegisters(Parse * pParse, Select * p, int iBreak)
assert(p->pOffset == 0 || p->pLimit != 0);
if (p->pLimit) {
if((p->pLimit->flags & EP_Collate) != 0 ||
- (p->pOffset && (p->pOffset->flags & EP_Collate) != 0)) {
- sqlite3ErrorMsg(pParse, "near \"COLLATE\": syntax error");
+ (p->pOffset != NULL &&
+ (p->pOffset->flags & EP_Collate) != 0)) {
+ sqlite3ErrorMsg(pParse, "near \"COLLATE\": "\
+ "syntax error");
return;
}
p->iLimit = iLimit = ++pParse->nMem;
In your patch sqlite3ErrorMsg was out of 80 symbols, and pointer p->pOffset must be checked
on != NULL explicitly. (I see, that other SQLite3 code does not this, but we will fix
this gradually).
After this the patch LGTM.
next prev parent reply other threads:[~2018-05-21 15:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-21 14:36 [tarantool-patches] " ImeevMA
2018-05-21 14:45 ` [tarantool-patches] " Vladislav Shpilevoy
2018-05-21 15:16 ` [tarantool-patches] " Мерген Имеев
2018-05-21 15:27 ` Vladislav Shpilevoy [this message]
2018-05-21 16:50 ` Мерген Имеев
2018-05-21 18:26 ` Vladislav Shpilevoy
2018-05-22 7:01 ` Kirill Yukhin
-- strict thread matches above, loose matches on Subject: below --
2018-05-21 13:35 [tarantool-patches] " ImeevMA
2018-05-21 13:45 ` [tarantool-patches] " Vladislav Shpilevoy
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=f123807c-1f14-b0e7-a7ec-345cf9c431ea@tarantool.org \
--to=v.shpilevoy@tarantool.org \
--cc=imeevma@tarantool.org \
--cc=tarantool-patches@freelists.org \
--subject='[tarantool-patches] Re: [PATCH v2 1/1] sql: COLLATE after LIMIT throws an error' \
/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