[tarantool-patches] Re: [PATCH v4 1/7] sql: fix code style in sqlite3Pragma
Vladislav Shpilevoy
v.shpilevoy at tarantool.org
Thu May 3 13:10:12 MSK 2018
Hello. Please, fix comments from the previous review.
On 28/04/2018 21:26, Kirill Shcherbatov wrote:
> ---
> src/box/sql/pragma.c | 56 +++++++++++++++++++++++++---------------------------
> 1 file changed, 27 insertions(+), 29 deletions(-)
>
> diff --git a/src/box/sql/pragma.c b/src/box/sql/pragma.c
> index e41f69b..4a68cad 100644
> --- a/src/box/sql/pragma.c
> +++ b/src/box/sql/pragma.c
> @@ -544,37 +544,35 @@ sqlite3Pragma(Parse * pParse, Token * pId, /* First part of [schema.]id field */
>
> #ifndef SQLITE_OMIT_FOREIGN_KEY
> case PragTyp_FOREIGN_KEY_LIST:{
> - if (zRight) {
> - FKey *pFK;
> - Table *pTab;
> - pTab = sqlite3HashFind(&db->pSchema->tblHash,
> - zRight);
> - if (pTab != NULL) {
> - pFK = pTab->pFKey;
> - if (pFK) {
> - int i = 0;
> - pParse->nMem = 8;
> - while (pFK) {
> - int j;
> - for (j = 0;
> - j < pFK->nCol;
> - j++) {
> - sqlite3VdbeMultiLoad(v, 1, "iissssss", i, j, pFK->zTo, pTab->aCol[pFK->aCol[j].iFrom].zName, pFK->aCol[j].zCol, actionName(pFK->aAction[1]), /* ON UPDATE */
> - actionName(pFK->aAction[0]), /* ON DELETE */
> - "NONE");
> - sqlite3VdbeAddOp2
> - (v,
> - OP_ResultRow,
> - 1, 8);
> - }
> - ++i;
> - pFK = pFK->pNextFrom;
> - }
> - }
> - }
> - }
> + if (!zRight)
> + break;
> + FKey *pFK;
> + Table *pTab;
> + pTab = sqlite3HashFind(&db->pSchema->tblHash, zRight);
> + if (pTab == NULL)
> break;
> + pFK = pTab->pFKey;
> + if (!pFK)
> + break;
> + int i = 0;
> + pParse->nMem = 8;
> + while (pFK) {
> + for (int j = 0; j < pFK->nCol; j++) {
> + const char *name =
> + pTab->aCol[pFK->aCol[j].iFrom].zName;
> + sqlite3VdbeMultiLoad(v, 1, "iissssss", i, j,
> + pFK->zTo, name,
> + pFK->aCol[j].zCol,
> + actionName(pFK->aAction[1]),
> + actionName(pFK->aAction[0]),
> + "NONE");
> + sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 8);
> + }
> + ++i;
> + pFK = pFK->pNextFrom;
> }
> + break;
> + }
> #endif /* !defined(SQLITE_OMIT_FOREIGN_KEY) */
>
> #ifndef SQLITE_OMIT_FOREIGN_KEY
>
More information about the Tarantool-patches
mailing list