* [tarantool-patches] [PATCH v2 1/1] sql: COLLATE after LIMIT throws an error
@ 2018-05-21 13:35 ImeevMA
2018-05-21 13:45 ` [tarantool-patches] " Vladislav Shpilevoy
0 siblings, 1 reply; 4+ messages in thread
From: ImeevMA @ 2018-05-21 13:35 UTC (permalink / raw)
To: tarantool-patches; +Cc: ImeevMA
Originally, SQLite3 execute queries with COLLATE after LIMIT like
"SELECT * FROM test LIMIT N COLLATE not_exist"
and queries without COLLATE like
"SELECT * FROM test LIMIT N"
the same way.
Closes #3010
---
Branch: https://github.com/tarantool/tarantool/tree/gh-3010-COLLATE-after-LIMIT-throws-an-error
Issue: https://github.com/tarantool/tarantool/issues/3010
src/box/sql/select.c | 5 +++++
test/sql-tap/collation.test.lua | 44 ++++++++++++++++++++++++++++++++++++++++-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index 29075d5..5e33256 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -1993,6 +1993,11 @@ computeLimitRegisters(Parse * pParse, Select * p, int iBreak)
sqlite3ExprCacheClear(pParse);
assert(p->pOffset == 0 || p->pLimit != 0);
if (p->pLimit) {
+ if((p->pLimit->flags & EP_Collate) ||
+ (p->pOffset && p->pOffset->flags & EP_Collate)) {
+ sqlite3ErrorMsg(pParse, "near \"COLLATE\": syntax error");
+ return;
+ }
p->iLimit = iLimit = ++pParse->nMem;
v = sqlite3GetVdbe(pParse);
assert(v != 0);
diff --git a/test/sql-tap/collation.test.lua b/test/sql-tap/collation.test.lua
index 8a98de9..5c7255a 100755
--- a/test/sql-tap/collation.test.lua
+++ b/test/sql-tap/collation.test.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env tarantool
test = require("sqltester")
-test:plan(173)
+test:plan(177)
local prefix = "collation-"
@@ -249,4 +249,46 @@ local like_testcases =
test:do_catchsql_set_test(like_testcases, prefix)
+-- gh-3010: COLLATE after LIMIT should throw an error
+
+test:do_catchsql_test(
+ "collate-after-limit-1.0",
+ "SELECT 1 LIMIT 1 COLLATE BINARY;", {
+ -- <collate-after-limit-1.0>
+ 1, "near \"COLLATE\": syntax error"
+ -- <collate-after-limit-1.0>
+});
+
+test:do_catchsql_test(
+ "collate-after-limit-1.1",
+ "SELECT 1 LIMIT 1 OFFSET 2 COLLATE BINARY;", {
+ -- <collate-after-limit-1.1>
+ 1, "near \"COLLATE\": syntax error"
+ -- <collate-after-limit-1.1>
+});
+
+test:do_catchsql_test(
+ "collate-after-limit-1.2",
+ "SELECT 1 LIMIT 1 COLLATE BINARY, 2;", {
+ -- <collate-after-limit-1.2>
+ 1, "near \"COLLATE\": syntax error"
+ -- <collate-after-limit-1.2>
+});
+
+
+local net_box = require('net.box')
+local test_run = require('test_run')
+local inspector = test_run.new()
+
+inspector:cmd("create server second with script='box/box.lua'\n")
+inspector:cmd('start server second')
+local uri = inspector:eval('second', 'box.cfg.listen')[1]
+local conn = net_box.connect(uri)
+
+test:ok(not pcall(function() conn:execute("select 1 limit 1 collate not_exist") end),
+ 'attempt to use collate after limit')
+
+conn:close()
+inspector:cmd('stop server second with cleanup=1')
+
test:finish_test()
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread* [tarantool-patches] Re: [PATCH v2 1/1] sql: COLLATE after LIMIT throws an error
2018-05-21 13:35 [tarantool-patches] [PATCH v2 1/1] sql: COLLATE after LIMIT throws an error ImeevMA
@ 2018-05-21 13:45 ` Vladislav Shpilevoy
0 siblings, 0 replies; 4+ messages in thread
From: Vladislav Shpilevoy @ 2018-05-21 13:45 UTC (permalink / raw)
To: tarantool-patches, ImeevMA
Hello. Thanks for the patch! See my 2 comments below.
On 21/05/2018 16:35, ImeevMA wrote:
> Originally, SQLite3 execute queries with COLLATE after LIMIT like
> "SELECT * FROM test LIMIT N COLLATE not_exist"
> and queries without COLLATE like
> "SELECT * FROM test LIMIT N"
> the same way.
>
> Closes #3010
> ---
> Branch: https://github.com/tarantool/tarantool/tree/gh-3010-COLLATE-after-LIMIT-throws-an-error
> Issue: https://github.com/tarantool/tarantool/issues/3010
>
> src/box/sql/select.c | 5 +++++
> test/sql-tap/collation.test.lua | 44 ++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 48 insertions(+), 1 deletion(-)
>
> diff --git a/src/box/sql/select.c b/src/box/sql/select.c
> index 29075d5..5e33256 100644
> --- a/src/box/sql/select.c
> +++ b/src/box/sql/select.c
> @@ -1993,6 +1993,11 @@ computeLimitRegisters(Parse * pParse, Select * p, int iBreak)
> sqlite3ExprCacheClear(pParse);
> assert(p->pOffset == 0 || p->pLimit != 0);
> if (p->pLimit) {
> + if((p->pLimit->flags & EP_Collate) ||
> + (p->pOffset && p->pOffset->flags & EP_Collate)) {
1. Please, use explicit != 0 to check, that an integer is not 0:
if ((p->pLimit->flags & EP_Collate) != 0 ...)
And fix alignment - the second line is very over indented.
> diff --git a/test/sql-tap/collation.test.lua b/test/sql-tap/collation.test.lua
> index 8a98de9..5c7255a 100755
> --- a/test/sql-tap/collation.test.lua
> +++ b/test/sql-tap/collation.test.lua
> @@ -1,6 +1,6 @@
> #!/usr/bin/env tarantool
> test = require("sqltester")
> -test:plan(173)
> +test:plan(177)
>
> local prefix = "collation-"
>
> @@ -249,4 +249,46 @@ local like_testcases =
>
> test:do_catchsql_set_test(like_testcases, prefix)
>
> +-- gh-3010: COLLATE after LIMIT should throw an error
> +
> +test:do_catchsql_test(
> + "collate-after-limit-1.0",
> + "SELECT 1 LIMIT 1 COLLATE BINARY;", {
> + -- <collate-after-limit-1.0>
> + 1, "near \"COLLATE\": syntax error"
> + -- <collate-after-limit-1.0>
> +});
> +
> +test:do_catchsql_test(
> + "collate-after-limit-1.1",
> + "SELECT 1 LIMIT 1 OFFSET 2 COLLATE BINARY;", {
> + -- <collate-after-limit-1.1>
> + 1, "near \"COLLATE\": syntax error"
> + -- <collate-after-limit-1.1>
> +});
> +
> +test:do_catchsql_test(
> + "collate-after-limit-1.2",
> + "SELECT 1 LIMIT 1 COLLATE BINARY, 2;", {
> + -- <collate-after-limit-1.2>
> + 1, "near \"COLLATE\": syntax error"
> + -- <collate-after-limit-1.2>
> +});
> +
> +
> +local net_box = require('net.box')
> +local test_run = require('test_run')
> +local inspector = test_run.new()
2. Hmm, it looks not to be a good idea to move netbox test there.
Lets better do this: create file sql/collation.test.lua, and move all
of gh-3010 tests into it. And please, add a test with OFFSET ... COLLATE.
> +
> +inspector:cmd("create server second with script='box/box.lua'\n")
> +inspector:cmd('start server second')
> +local uri = inspector:eval('second', 'box.cfg.listen')[1]
> +local conn = net_box.connect(uri)
> +
> +test:ok(not pcall(function() conn:execute("select 1 limit 1 collate not_exist") end),
> + 'attempt to use collate after limit')
> +
> +conn:close()
> +inspector:cmd('stop server second with cleanup=1')
> +
> test:finish_test()
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tarantool-patches] [PATCH v2 1/1] sql: COLLATE after LIMIT throws an error
@ 2018-05-21 14:27 ImeevMA
0 siblings, 0 replies; 4+ messages in thread
From: ImeevMA @ 2018-05-21 14:27 UTC (permalink / raw)
To: tarantool-patches; +Cc: ImeevMA
Originally, SQLite3 execute queries with COLLATE after LIMIT like
"SELECT * FROM test LIMIT N COLLATE not_exist"
and queries without COLLATE like
"SELECT * FROM test LIMIT N"
the same way.
Closes #3010
---
Branch: https://github.com/tarantool/tarantool/tree/gh-3010-COLLATE-after-LIMIT-throws-an-error
Issue: https://github.com/tarantool/tarantool/issues/3010
src/box/sql/select.c | 5 +++++
test/sql/collation.result | 41 +++++++++++++++++++++++++++++++++++++++++
test/sql/collation.test.lua | 19 +++++++++++++++++++
3 files changed, 65 insertions(+)
create mode 100644 test/sql/collation.result
create mode 100644 test/sql/collation.test.lua
diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index 29075d5..b11e688 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -1993,6 +1993,11 @@ computeLimitRegisters(Parse * pParse, Select * p, int iBreak)
sqlite3ExprCacheClear(pParse);
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");
+ return;
+ }
p->iLimit = iLimit = ++pParse->nMem;
v = sqlite3GetVdbe(pParse);
assert(v != 0);
diff --git a/test/sql/collation.result b/test/sql/collation.result
new file mode 100644
index 0000000..3a4f81f
--- /dev/null
+++ b/test/sql/collation.result
@@ -0,0 +1,41 @@
+remote = require('net.box')
+---
+...
+-- gh-3010: COLLATE after LIMIT should throw an error
+-- All of these tests should throw error "near "COLLATE": syntax error"
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY;")
+---
+- error: 'near "COLLATE": syntax error'
+...
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY OFFSET 1;")
+---
+- error: 'near "COLLATE": syntax error'
+...
+box.sql.execute("SELECT 1 LIMIT 1 OFFSET 1 COLLATE BINARY;")
+---
+- error: 'near "COLLATE": syntax error'
+...
+box.sql.execute("SELECT 1 LIMIT 1, 1 COLLATE BINARY;")
+---
+- error: 'near "COLLATE": syntax error'
+...
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY, 1;")
+---
+- error: 'near "COLLATE": syntax error'
+...
+box.schema.user.grant('guest','read,write,execute', 'universe')
+---
+...
+cn = remote.connect(box.cfg.listen)
+---
+...
+cn:execute('select 1 limit ? collate not_exist', {1})
+---
+- error: 'Failed to execute SQL statement: near "COLLATE": syntax error'
+...
+cn:close()
+---
+...
+box.schema.user.revoke('guest', 'read,write,execute', 'universe')
+---
+...
diff --git a/test/sql/collation.test.lua b/test/sql/collation.test.lua
new file mode 100644
index 0000000..fe8c1ba
--- /dev/null
+++ b/test/sql/collation.test.lua
@@ -0,0 +1,19 @@
+remote = require('net.box')
+
+-- gh-3010: COLLATE after LIMIT should throw an error
+
+-- All of these tests should throw error "near "COLLATE": syntax error"
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY;")
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY OFFSET 1;")
+box.sql.execute("SELECT 1 LIMIT 1 OFFSET 1 COLLATE BINARY;")
+box.sql.execute("SELECT 1 LIMIT 1, 1 COLLATE BINARY;")
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY, 1;")
+
+
+box.schema.user.grant('guest','read,write,execute', 'universe')
+cn = remote.connect(box.cfg.listen)
+
+cn:execute('select 1 limit ? collate not_exist', {1})
+
+cn:close()
+box.schema.user.revoke('guest', 'read,write,execute', 'universe')
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread* [tarantool-patches] [PATCH v2 1/1] sql: COLLATE after LIMIT throws an error
@ 2018-05-21 14:36 ImeevMA
0 siblings, 0 replies; 4+ messages in thread
From: ImeevMA @ 2018-05-21 14:36 UTC (permalink / raw)
To: tarantool-patches; +Cc: ImeevMA
Originally, SQLite3 execute queries with COLLATE after LIMIT like
"SELECT * FROM test LIMIT N COLLATE not_exist"
and queries without COLLATE like
"SELECT * FROM test LIMIT N"
the same way.
From this patch on queries with COLLATE after LIMIT
or OFFSET throws a syntax error.
Closes #3010
---
src/box/sql/select.c | 5 +++++
test/sql/collation.result | 41 +++++++++++++++++++++++++++++++++++++++++
test/sql/collation.test.lua | 19 +++++++++++++++++++
3 files changed, 65 insertions(+)
create mode 100644 test/sql/collation.result
create mode 100644 test/sql/collation.test.lua
diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index 29075d5..b11e688 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -1993,6 +1993,11 @@ computeLimitRegisters(Parse * pParse, Select * p, int iBreak)
sqlite3ExprCacheClear(pParse);
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");
+ return;
+ }
p->iLimit = iLimit = ++pParse->nMem;
v = sqlite3GetVdbe(pParse);
assert(v != 0);
diff --git a/test/sql/collation.result b/test/sql/collation.result
new file mode 100644
index 0000000..3a4f81f
--- /dev/null
+++ b/test/sql/collation.result
@@ -0,0 +1,41 @@
+remote = require('net.box')
+---
+...
+-- gh-3010: COLLATE after LIMIT should throw an error
+-- All of these tests should throw error "near "COLLATE": syntax error"
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY;")
+---
+- error: 'near "COLLATE": syntax error'
+...
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY OFFSET 1;")
+---
+- error: 'near "COLLATE": syntax error'
+...
+box.sql.execute("SELECT 1 LIMIT 1 OFFSET 1 COLLATE BINARY;")
+---
+- error: 'near "COLLATE": syntax error'
+...
+box.sql.execute("SELECT 1 LIMIT 1, 1 COLLATE BINARY;")
+---
+- error: 'near "COLLATE": syntax error'
+...
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY, 1;")
+---
+- error: 'near "COLLATE": syntax error'
+...
+box.schema.user.grant('guest','read,write,execute', 'universe')
+---
+...
+cn = remote.connect(box.cfg.listen)
+---
+...
+cn:execute('select 1 limit ? collate not_exist', {1})
+---
+- error: 'Failed to execute SQL statement: near "COLLATE": syntax error'
+...
+cn:close()
+---
+...
+box.schema.user.revoke('guest', 'read,write,execute', 'universe')
+---
+...
diff --git a/test/sql/collation.test.lua b/test/sql/collation.test.lua
new file mode 100644
index 0000000..fe8c1ba
--- /dev/null
+++ b/test/sql/collation.test.lua
@@ -0,0 +1,19 @@
+remote = require('net.box')
+
+-- gh-3010: COLLATE after LIMIT should throw an error
+
+-- All of these tests should throw error "near "COLLATE": syntax error"
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY;")
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY OFFSET 1;")
+box.sql.execute("SELECT 1 LIMIT 1 OFFSET 1 COLLATE BINARY;")
+box.sql.execute("SELECT 1 LIMIT 1, 1 COLLATE BINARY;")
+box.sql.execute("SELECT 1 LIMIT 1 COLLATE BINARY, 1;")
+
+
+box.schema.user.grant('guest','read,write,execute', 'universe')
+cn = remote.connect(box.cfg.listen)
+
+cn:execute('select 1 limit ? collate not_exist', {1})
+
+cn:close()
+box.schema.user.revoke('guest', 'read,write,execute', 'universe')
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-21 14:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-21 13:35 [tarantool-patches] [PATCH v2 1/1] sql: COLLATE after LIMIT throws an error ImeevMA
2018-05-21 13:45 ` [tarantool-patches] " Vladislav Shpilevoy
2018-05-21 14:27 [tarantool-patches] " ImeevMA
2018-05-21 14:36 ImeevMA
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox