From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id CEB4922A50 for ; Fri, 28 Dec 2018 04:34:57 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ohgt7Di-CGCF for ; Fri, 28 Dec 2018 04:34:57 -0500 (EST) Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 6E17C22A31 for ; Fri, 28 Dec 2018 04:34:57 -0500 (EST) From: Nikita Pettik Subject: [tarantool-patches] [PATCH 1/8] sql: remove SQLITE_ENABLE_UPDATE_DELETE_LIMIT define Date: Fri, 28 Dec 2018 11:34:45 +0200 Message-Id: <628c1d80ee13227d3e3d520707c3d404346fc94f.1545987214.git.korablev@tarantool.org> In-Reply-To: References: In-Reply-To: References: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: v.shpilevoy@tarantool.org, Nikita Pettik Code under this define is dead. What is more, it uses affinity, so lets remove it. Needed for #3698 --- src/box/sql/parse.y | 2 -- src/box/sql/resolve.c | 20 -------------------- 2 files changed, 22 deletions(-) diff --git a/src/box/sql/parse.y b/src/box/sql/parse.y index 50bb2ba01..b664a4101 100644 --- a/src/box/sql/parse.y +++ b/src/box/sql/parse.y @@ -727,7 +727,6 @@ where_opt(A) ::= WHERE expr(X). {A = X.pExpr;} ////////////////////////// The UPDATE command //////////////////////////////// // -%ifndef SQLITE_ENABLE_UPDATE_DELETE_LIMIT cmd ::= with(C) UPDATE orconf(R) fullname(X) indexed_opt(I) SET setlist(Y) where_opt(W). { sqlite3WithPush(pParse, C, 1); @@ -738,7 +737,6 @@ cmd ::= with(C) UPDATE orconf(R) fullname(X) indexed_opt(I) SET setlist(Y) pParse->initiateTTrans = true; sqlite3Update(pParse,X,Y,W,R); } -%endif %type setlist {ExprList*} %destructor setlist {sql_expr_list_delete(pParse->db, $$);} diff --git a/src/box/sql/resolve.c b/src/box/sql/resolve.c index 9a2d6ff4e..c1253ab95 100644 --- a/src/box/sql/resolve.c +++ b/src/box/sql/resolve.c @@ -579,26 +579,6 @@ resolveExprStep(Walker * pWalker, Expr * pExpr) } #endif switch (pExpr->op) { - -#if defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) - /* The special operator TK_ROW means use the rowid for the first - * column in the FROM clause. This is used by the LIMIT and ORDER BY - * clause processing on UPDATE and DELETE statements. - */ - case TK_ROW:{ - SrcList *pSrcList = pNC->pSrcList; - struct SrcList_item *pItem; - assert(pSrcList && pSrcList->nSrc == 1); - pItem = pSrcList->a; - pExpr->op = TK_COLUMN; - pExpr->pTab = pItem->pTab; - pExpr->iTable = pItem->iCursor; - pExpr->iColumn = -1; - pExpr->affinity = AFFINITY_INTEGER; - break; - } -#endif /* defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) */ - /* A lone identifier is the name of a column. */ case TK_ID:{ -- 2.15.1