From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 207DE445320 for ; Wed, 8 Jul 2020 14:47:22 +0300 (MSK) From: Roman Khabibov Date: Wed, 8 Jul 2020 14:47:17 +0300 Message-Id: <20200708114718.38910-2-roman.habibov@tarantool.org> In-Reply-To: <20200708114718.38910-1-roman.habibov@tarantool.org> References: <20200708114718.38910-1-roman.habibov@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 1/2] sql: fix _session_settings name in error messages List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Print the true name of _session_settings space in error messages. Follow up #4511 --- src/box/session_settings.c | 8 ++++---- test/box/session_settings.result | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/box/session_settings.c b/src/box/session_settings.c index dbbbf2461..2f4b8c2f0 100644 --- a/src/box/session_settings.c +++ b/src/box/session_settings.c @@ -301,7 +301,7 @@ session_settings_space_execute_replace(struct space *space, struct txn *txn, (void)txn; (void)request; (void)result; - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings space", + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings space", "replace()"); return -1; } @@ -315,7 +315,7 @@ session_settings_space_execute_delete(struct space *space, struct txn *txn, (void)txn; (void)request; (void)result; - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings space", + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings space", "delete()"); return -1; } @@ -388,7 +388,7 @@ session_settings_space_execute_upsert(struct space *space, struct txn *txn, (void)space; (void)txn; (void)request; - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings space", + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings space", "upsert()"); return -1; } @@ -398,7 +398,7 @@ session_settings_space_create_index(struct space *space, struct index_def *def) { assert(space->def->id == BOX_SESSION_SETTINGS_ID); if (def->iid != 0) { - diag_set(ClientError, ER_UNSUPPORTED, "Session_settings space", + diag_set(ClientError, ER_UNSUPPORTED, "_session_settings space", "create_index()"); return NULL; } diff --git a/test/box/session_settings.result b/test/box/session_settings.result index 149cc4bd5..d38707ef8 100644 --- a/test/box/session_settings.result +++ b/test/box/session_settings.result @@ -30,19 +30,19 @@ s:drop() -- s:create_index('a') | --- - | - error: Session_settings space does not support create_index() + | - error: _session_settings space does not support create_index() | ... s:insert({'a', 1}) | --- - | - error: Session_settings space does not support replace() + | - error: _session_settings space does not support replace() | ... s:delete({'b'}) | --- - | - error: Session_settings space does not support delete() + | - error: _session_settings space does not support delete() | ... s:replace({'sql_defer_foreign_keys', true}) | --- - | - error: Session_settings space does not support replace() + | - error: _session_settings space does not support replace() | ... -- -- 2.21.0 (Apple Git-122)