[tarantool-patches] Re: [tarantool-patches] Re: [PATCH v2 1/1] sql: COLLATE after LIMIT throws an error

["Мерген Имеев" <imeevma@tarantool.org>]

[-- Attachment #1: Type: text/plain, Size: 4591 bytes --]




>Понедельник, 21 мая 2018, 18:27 +03:00 от Vladislav Shpilevoy <v.shpilevoy@tarantool.org>:
>
>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). 
Done.
>
>
>After this the patch LGTM.
>

commit 8ae83069671e7384c70523f4eda201d4815dba26
Author: ImeevMA <imeevma@tarantool.org>
Date:   Mon May 21 16:21:57 2018 +0300

    sql: COLLATE after LIMIT throws an error
    
    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

diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index 29075d5..fc1da27 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -1993,6 +1993,13 @@ 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 != NULL &&
+           (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')



[-- Attachment #2: Type: text/html, Size: 6194 bytes --]