[tarantool-patches] Re: [PATCH v2 07/11] sql: move sqlite3DeleteTrigger to sql.h

[Vladislav Shpilevoy]

Thanks for the patch!
Please, rationalize the patch in the commit message.
I know why the patch is needed, but Nikita, for example,
does not. Anyone else either.

On 09/06/2018 12:32, Kirill Shcherbatov wrote:
> Part of #3273.
> ---
>   src/box/sql.h           |  9 +++++++++
>   src/box/sql/callback.c  |  2 +-
>   src/box/sql/sqliteInt.h |  3 +--
>   src/box/sql/status.c    |  6 +++---
>   src/box/sql/tokenize.c  |  2 +-
>   src/box/sql/trigger.c   | 25 +++++++++++--------------
>   6 files changed, 26 insertions(+), 21 deletions(-)
> 
Please, apply this:

diff --git a/src/box/sql/callback.c b/src/box/sql/callback.c
index e3f36e301..bd8db9994 100644
--- a/src/box/sql/callback.c
+++ b/src/box/sql/callback.c
@@ -290,10 +290,9 @@ sqlite3SchemaClear(sqlite3 * db)
  	temp1 = pSchema->tblHash;
  	temp2 = pSchema->trigHash;
  	sqlite3HashInit(&pSchema->trigHash);
-	for (pElem = sqliteHashFirst(&temp2); pElem;
-	     pElem = sqliteHashNext(pElem)) {
-		sql_trigger_delete(0, (Trigger *) sqliteHashData(pElem));
-	}
+	for (pElem = sqliteHashFirst(&temp2); pElem != NULL;
+	     pElem = sqliteHashNext(pElem))
+		sql_trigger_delete(NULL, (Trigger *) sqliteHashData(pElem));
  	sqlite3HashClear(&temp2);
  	sqlite3HashInit(&pSchema->tblHash);
  	for (pElem = sqliteHashFirst(&temp1); pElem;
diff --git a/src/box/sql/trigger.c b/src/box/sql/trigger.c
index 053dadbd9..5e21cfca6 100644
--- a/src/box/sql/trigger.c
+++ b/src/box/sql/trigger.c
@@ -185,11 +185,10 @@ sqlite3BeginTrigger(Parse * pParse,	/* The parse context of the CREATE TRIGGER s
  	sqlite3SrcListDelete(db, pTableName);
  	sqlite3IdListDelete(db, pColumns);
  	sql_expr_delete(db, pWhen, false);
-	if (!pParse->pNewTrigger) {
+	if (pParse->pNewTrigger == NULL)
  		sql_trigger_delete(db, pTrigger);
-	} else {
+	else
  		assert(pParse->pNewTrigger == pTrigger);
-	}
  }
  
  /*