From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 876C66E459; Sat, 20 Nov 2021 03:45:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 876C66E459 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1637369138; bh=yfWMgxviw408xFlLoSFraZV2HaLMBtzvJ1enBWILIZk=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=p2XuucUaf2On033EzcQNGL6nPpyuhPVYxGDCA0kbVNge9FvgJDaJ0Y4QgKMT+14HL XgoCJHYV03mTI8ZNiosmwgzXvK0NgyRsWHA+Ry53+zBV5P8ksgCRIQj1C6Yj7rlwpW 60H23MSwA+82blA3tI4O8beR3uRZZ0sw6PgsgAnc= Received: from smtpng3.i.mail.ru (smtpng3.i.mail.ru [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D8E956E459 for ; Sat, 20 Nov 2021 03:45:37 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D8E956E459 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1moEVc-00025q-Vz; Sat, 20 Nov 2021 03:45:37 +0300 Message-ID: Date: Sat, 20 Nov 2021 01:45:36 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.3.1 Content-Language: en-US To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9731B3922EC063979441C7E49BA1D360DCF2D4FD3FE2A0DCE00894C459B0CD1B999A853CF13D65141F9D82886FAEF18D6B9415F14626DCF3FFD46E3179386CC54 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE743D95D1474A4F818EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063754D7F012132A27898638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8392AAE30A9738D7D340D7F498DBEFA9C117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC8C7ADC89C2F0B2A5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6300D3B61E77C8D3B089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B505C576550E7231921E0175CE3554288535 X-C1DE0DAB: 0D63561A33F958A51C84A7AB8AA32FED5D00BBD02CD43337076E3746D376B8E9D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7506FE1F977233B9BB410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3454548929AF40B428FB40B724DAB83226C9FAE2A70D03219CD9932D8A31E31021422B313FD64D12A81D7E09C32AA3244CC42A364FA768EF7E7256891954569D3B8580396430872480729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojUkwcpHt8ZEd3kyV1NWmevg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DEA29DBB6DE2B18963269B41D96C0A39D3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v1 1/2] sql: properly check bind variable names X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thanks for the patch! Shouldn't these be the same? tarantool> box.execute('SELECT $name', {}) --- - null - Index of binding slots must start from 1 ... tarantool> box.execute('SELECT @name', {}) --- - metadata: - name: COLUMN_1 type: boolean rows: - [null] ... See 4 comments below. > diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c > index eb169aeb8..74a98c550 100644 > --- a/src/box/sql/expr.c > +++ b/src/box/sql/expr.c > @@ -1314,6 +1314,52 @@ sqlExprAssignVarNumber(Parse * pParse, Expr * pExpr, u32 n) > } > } > > +struct Expr * > +expr_variable(struct Parse *parse, struct Token *spec, struct Token *id) 1. You might want to call it expr_new_variable(). Or sql_expr_new_variable(). To be consistent with our naming policy for constructors allocating memory and for consistency with with sql_expr_new_column(), sql_expr_new(), sql_expr_new_dequoted(), sql_expr_new_named(), sql_expr_new_anon(). 2. spec and id can be made const. > +{ > + assert(spec != 0 && id != NULL && spec->n == 1); > + if (id->z - spec->z != 1) { > + diag_set(ClientError, ER_SQL_UNKNOWN_TOKEN, parse->line_count, > + spec->z - parse->zTail + 1, spec->n, spec->z); > + parse->is_aborted = true; > + return NULL; > + } > diff --git a/src/box/sql/parse.y b/src/box/sql/parse.y > index 92fb37dd4..06e6244e3 100644 > --- a/src/box/sql/parse.y > +++ b/src/box/sql/parse.y > @@ -1087,31 +1087,29 @@ term(A) ::= INTEGER(X). { > A.zEnd = X.z + X.n; > if( A.pExpr ) A.pExpr->flags |= EP_Leaf; > } > -expr(A) ::= VARIABLE(X). { > - Token t = X; > +expr(A) ::= VARNUM(X). { > if (pParse->parse_only) { > - spanSet(&A, &t, &t); > diag_set(ClientError, ER_SQL_PARSER_GENERIC_WITH_POS, pParse->line_count, > pParse->line_pos, "bindings are not allowed in DDL"); > pParse->is_aborted = true; 3. Hm. It looks not so good that this complicated error is now in 2 places and is exactly the same. Maybe we could have a common function both for positional and named arguments? Or 2 functions, but they would use one more generic function inside? For instance, one function could be sql_expr_new_var(struct Parse *parse, const struct Token *spec, const struct Token *id); For positionals it would be called as sql_expr_new_var(pParse, &X, NULL); For named: sql_expr_new_var(pParse, &X, &Y); (like now) Then we could also drop TK_VARIABLE from spanExpr() completely. > A.pExpr = NULL; > - } else if (!(X.z[0]=='#' && sqlIsdigit(X.z[1]))) { > - u32 n = X.n; > + A.zEnd = &X.z[X.n]; > + } else { > spanExpr(&A, pParse, TK_VARIABLE, X); > - if (A.pExpr->u.zToken[0] == '?' && n > 1) { > - diag_set(ClientError, ER_SQL_SYNTAX_NEAR_TOKEN, pParse->line_count, t.n, t.z); > - pParse->is_aborted = true; > - } else { > - sqlExprAssignVarNumber(pParse, A.pExpr, n); > - } > - }else{ > - assert( t.n>=2 ); > - spanSet(&A, &t, &t); > - diag_set(ClientError, ER_SQL_SYNTAX_NEAR_TOKEN, pParse->line_count, t.n, t.z); > - pParse->is_aborted = true; > - A.pExpr = NULL; > + assert(A.pExpr->u.zToken[0] == '?' && X.n == 1); > + sqlExprAssignVarNumber(pParse, A.pExpr, X.n); > } > } > +expr(A) ::= VARIABLE(X) id(Y). { > + A.pExpr = expr_variable(pParse, &X, &Y); > + A.zStart = X.z; > + A.zEnd = &Y.z[Y.n]; > +} > +expr(A) ::= VARIABLE(X) INTEGER(Y). { > + A.pExpr = expr_variable(pParse, &X, &Y); > + A.zStart = X.z; > + A.zEnd = &Y.z[Y.n]; > +} 4. Lets drop the extra spaces before { symbols.