[tarantool-patches] Re: [PATCH v1 1/3] sql: restrict nullable action definitions

[Kirill Shcherbatov]

After verbal discussion, I've made small fix and merged "[draft] don't use on_conflict_default_MAX".
Don't forget that this patch is now on Kirill's iPkey patch and should be merged to upstream later.

On 23.07.2018 11:31, Kirill Shcherbatov wrote:
> Hi again!
> I've rebased my patch on Kirill's Y. branch kyukhin/gh-3482-remove-ipkey;
> I've also have succeed in using  ON_CONFLICT_ACTION_DEFAULT instead of on_conflict_action_MAX.
> This changes represented as "[draft] don't use on_conflict_default_MAX" commit on my branch.
> I've have had to introduce small rule index_onconf that looks very similar with onconf. If I not mistaken,
> you are going to get rid of Index on_conflict action; and this rudiment crap would disappear. 

=============================================

diff --git a/src/box/sql/build.c b/src/box/sql/build.c
index ba80d1d..ec0c06b 100644
--- a/src/box/sql/build.c
+++ b/src/box/sql/build.c
@@ -950,7 +950,7 @@ sqlite3AddPrimaryKey(Parse * pParse,	/* Parsing context */
 					    sqlite3ExprAlloc(db, TK_ID,
 							     &token, 0));
 		if (list == NULL)
-			return;
+			goto primary_key_exit;
 		sql_create_index(pParse, 0, 0, list, onError, 0, 0,
 				 SORT_ORDER_ASC, false,
 				 SQL_INDEX_TYPE_CONSTRAINT_PK);
@@ -959,21 +959,23 @@ sqlite3AddPrimaryKey(Parse * pParse,	/* Parsing context */
 	} else if (autoInc) {
 		sqlite3ErrorMsg(pParse, "AUTOINCREMENT is only allowed on an "
 				"INTEGER PRIMARY KEY or INT PRIMARY KEY");
+		goto primary_key_exit;
 	} else {
 		sql_create_index(pParse, 0, 0, pList, onError, 0,
 				 0, sortOrder, false,
 				 SQL_INDEX_TYPE_CONSTRAINT_PK);
 		pList = 0;
+		if (pParse->nErr > 0)
+			goto primary_key_exit;
 	}
 
 	struct Index *pk = sqlite3PrimaryKeyIndex(pTab);
-	if (pk != NULL) {
-		struct key_def *pk_key_def = pk->def->key_def;
-		for (uint32_t i = 0; i < pk_key_def->part_count; i++) {
-			uint32_t idx = pk_key_def->parts[i].fieldno;
-			field_def_create_for_pk(pParse, &pTab->def->fields[idx],
-						pTab->def->name);
-		}
+	assert(pk != NULL);
+	struct key_def *pk_key_def = pk->def->key_def;
+	for (uint32_t i = 0; i < pk_key_def->part_count; i++) {
+		uint32_t idx = pk_key_def->parts[i].fieldno;
+		field_def_create_for_pk(pParse, &pTab->def->fields[idx],
+					pTab->def->name);
 	}
 primary_key_exit:
 	sql_expr_list_delete(pParse->db, pList);