From: Kirill Shcherbatov <kshcherbatov@tarantool.org> To: tarantool-patches@freelists.org Cc: "v.shpilevoy@tarantool.org" <v.shpilevoy@tarantool.org> Subject: [tarantool-patches] Re: [PATCH v7 5/7] sql: change sqlite3AddCheckConstraint signature Date: Fri, 25 May 2018 14:53:57 +0300 [thread overview] Message-ID: <d85f2062-38d9-0db4-aabc-95bc4d5e5ca7@tarantool.org> (raw) In-Reply-To: <314e11a2-5b51-df44-e2b8-bd22c8fa66f1@tarantool.org> > 1. Renamed refactored? sql: change sqlite3AddCheckConstraint signature As we would store Check source expr in MsgPack we need span instead of parsed Expr in sqlite3AddCheckConstraint. Part of #3272.↵ > 2. This macro is not defined. You can remove it. > 3. != 0 > 4. If 'if' body is in {}, then else must be too. diff --git a/src/box/sql/build.c b/src/box/sql/build.c index afb1128..50e4985 100644 --- a/src/box/sql/build.c +++ b/src/box/sql/build.c @@ -1022,19 +1022,19 @@ sqlite3AddPrimaryKey(Parse * pParse, /* Parsing context */ void sql_add_check_constraint(Parse *parser, ExprSpan *span) { -#ifndef SQLITE_OMIT_CHECK struct Expr *expr = span->pExpr; Table *table = parser->pNewTable; if (table != NULL) { table->pCheck = sqlite3ExprListAppend(parser, table->pCheck, expr); - if (parser->constraintName.n) { + if (parser->constraintName.n != 0) { sqlite3ExprListSetName(parser, table->pCheck, &parser->constraintName, 1); } - } else -#endif + } else { sql_expr_delete(parser->db, expr, false); + + } } /* > 5. span parser? And the span is not parsed. You said it in the commit message: > "we need span instead of parsed Expr". - * @param span parser parsed expression object.. + * @param check expression span object. > 6. Wrap line after return type declaration. -void sql_add_check_constraint(Parse *parser, ExprSpan *span); +void +sql_add_check_constraint(Parse *parser, ExprSpan *span);
next prev parent reply other threads:[~2018-05-25 11:54 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-23 14:05 [tarantool-patches] [PATCH v7 0/7] sql: remove Checks to server Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 1/7] sql: remove parser construct, destruct to sql.h Kirill Shcherbatov 2018-05-23 17:46 ` [tarantool-patches] " Konstantin Osipov 2018-05-24 19:26 ` Vladislav Shpilevoy 2018-05-25 12:05 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 2/7] box: introduce OPT_ARRAY opt_type to decode arrays Kirill Shcherbatov 2018-05-23 17:53 ` [tarantool-patches] " Konstantin Osipov 2018-05-24 7:32 ` Kirill Shcherbatov 2018-05-24 19:26 ` Vladislav Shpilevoy 2018-05-25 11:54 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 3/7] sql: introduce expr_len for sql_expr_compile Kirill Shcherbatov 2018-05-24 19:26 ` [tarantool-patches] " Vladislav Shpilevoy 2018-05-25 11:54 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 4/7] sql: rename sql_expr_free to sql_expr_delete Kirill Shcherbatov 2018-05-23 18:00 ` [tarantool-patches] " Konstantin Osipov 2018-05-24 19:26 ` Vladislav Shpilevoy 2018-05-25 11:54 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 5/7] sql: change sqlite3AddCheckConstraint signature Kirill Shcherbatov 2018-05-23 18:01 ` [tarantool-patches] " Konstantin Osipov 2018-05-24 19:26 ` Vladislav Shpilevoy 2018-05-25 11:53 ` Kirill Shcherbatov [this message] 2018-05-29 11:51 ` n.pettik 2018-05-30 8:32 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 6/7] sql: export funcs defined on Expr, ExprList to sql.h Kirill Shcherbatov 2018-05-23 18:15 ` [tarantool-patches] " Konstantin Osipov 2018-05-24 7:33 ` Kirill Shcherbatov 2018-05-24 19:26 ` Vladislav Shpilevoy 2018-05-25 11:53 ` Kirill Shcherbatov 2018-05-28 11:19 ` Vladislav Shpilevoy 2018-05-28 14:59 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 7/7] sql: remove Checks to server Kirill Shcherbatov 2018-05-24 19:26 ` [tarantool-patches] " Vladislav Shpilevoy 2018-05-25 11:53 ` Kirill Shcherbatov 2018-05-28 11:19 ` Vladislav Shpilevoy 2018-05-28 14:59 ` Kirill Shcherbatov 2018-05-28 18:50 ` Vladislav Shpilevoy 2018-05-29 11:49 ` n.pettik 2018-05-30 8:32 ` Kirill Shcherbatov 2018-05-30 10:42 ` n.pettik 2018-05-25 12:04 ` [tarantool-patches] Re: [PATCH v7 0/7] " Kirill Shcherbatov 2018-05-28 11:19 ` Vladislav Shpilevoy 2018-05-30 11:03 ` n.pettik 2018-05-31 17:44 ` Kirill Yukhin
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=d85f2062-38d9-0db4-aabc-95bc4d5e5ca7@tarantool.org \ --to=kshcherbatov@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=v.shpilevoy@tarantool.org \ --subject='[tarantool-patches] Re: [PATCH v7 5/7] sql: change sqlite3AddCheckConstraint signature' \ /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