From 3abd5926fcfa5a5ac7c817859fb4d8ae7aeec23d Mon Sep 17 00:00:00 2001
From: Mergen Imeev <imeevma@gmail.com>
Date: Sun, 24 Feb 2019 12:02:49 +0300
Subject: [PATCH] sql: set SQL parser errors via diag_set()
After this patch all SQL parser errors will be set via diag_set().
They were saved in field zErrMsg of struct Parse before this
patch.
Part of #3965
---
src/box/errcode.h | 1 +
src/box/sql/build.c | 3 ++-
src/box/sql/malloc.c | 27 ++++++++++++---------------
src/box/sql/prepare.c | 5 ++---
src/box/sql/tokenize.c | 10 ++++------
src/box/sql/util.c | 9 +++++----
test/box/misc.result | 1 +
test/sql-tap/check.test.lua | 2 +-
test/sql/triggers.result | 4 ++--
9 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/box/errcode.h b/src/box/errcode.h
index f2f47c027b..d234d26c85 100644
--- a/src/box/errcode.h
+++ b/src/box/errcode.h
@@ -238,6 +238,7 @@ struct errcode_record {
/*183 */_(ER_SQL_KEYWORD_IS_RESERVED, "Keyword '%.*s' is reserved. Please use double quotes if '%.*s' is an identifier.") \
/*184 */_(ER_SQL_UNRECOGNIZED_SYNTAX, "Syntax error near '%.*s'") \
/*185 */_(ER_SQL_UNKNOWN_TOKEN, "Syntax error: unrecognized token: '%.*s'") \
+ /*186 */_(ER_SQL_PARSER_GENERIC, "%s") \
/*
* !IMPORTANT! Please follow instructions at start of the file
diff --git a/src/box/sql/build.c b/src/box/sql/build.c
index f112c9ff1e..deb5b894cf 100644
--- a/src/box/sql/build.c
+++ b/src/box/sql/build.c
@@ -194,7 +194,8 @@ sql_finish_coding(struct Parse *parse_context)
sqlVdbeMakeReady(v, parse_context);
parse_context->rc = SQL_DONE;
} else {
- parse_context->rc = SQL_ERROR;
+ if (parse_context->rc != SQL_TARANTOOL_ERROR)
+ parse_context->rc = SQL_ERROR;
}
}
/**
diff --git a/src/box/sql/malloc.c b/src/box/sql/malloc.c
index e0d2ec886f..dc018fc634 100644
--- a/src/box/sql/malloc.c
+++ b/src/box/sql/malloc.c
@@ -51,14 +51,13 @@ sql_sized_malloc(int nByte)
assert(nByte > 0);
nByte = ROUND8(nByte);
p = malloc(nByte + 8);
- if (p) {
- p[0] = nByte;
- p++;
- } else {
- testcase(sqlGlobalConfig.xLog != 0);
- sql_log(SQL_NOMEM,
- "failed to allocate %u bytes of memory", nByte);
+ if (p == NULL) {
+ sql_get()->mallocFailed = 1;
+ diag_set(OutOfMemory, nByte, "malloc", "p");
+ return NULL;
}
+ p[0] = nByte;
+ p++;
return (void *)p;
}
@@ -111,15 +110,13 @@ sql_sized_realloc(void *pPrior, int nByte)
assert(nByte == ROUND8(nByte)); /* EV: R-46199-30249 */
p--;
p = realloc(p, nByte + 8);
- if (p) {
- p[0] = nByte;
- p++;
- } else {
- testcase(sqlGlobalConfig.xLog != 0);
- sql_log(SQL_NOMEM,
- "failed memory resize %u to %u bytes",
- sql_sized_sizeof(pPrior), nByte);
+ if (p == NULL) {
+ sql_get()->mallocFailed = 1;
+ diag_set(OutOfMemory, nByte, "realloc", "p");
+ return NULL;
}
+ p[0] = nByte;
+ p++;
return (void *)p;
}
diff --git a/src/box/sql/prepare.c b/src/box/sql/prepare.c
index 0c6296d4f6..828a1aee8c 100644
--- a/src/box/sql/prepare.c
+++ b/src/box/sql/prepare.c
@@ -102,9 +102,8 @@ sqlPrepare(sql * db, /* Database handle. */
if (sParse.rc == SQL_DONE)
sParse.rc = SQL_OK;
- if (db->mallocFailed) {
- sParse.rc = SQL_NOMEM;
- }
+ if (db->mallocFailed)
+ sParse.rc = SQL_TARANTOOL_ERROR;
if (pzTail) {
*pzTail = sParse.zTail;
}
diff --git a/src/box/sql/tokenize.c b/src/box/sql/tokenize.c
index 58685c4b8c..f0a2f166f0 100644
--- a/src/box/sql/tokenize.c
+++ b/src/box/sql/tokenize.c
@@ -483,7 +483,9 @@ sqlRunParser(Parse * pParse, const char *zSql, char **pzErrMsg)
&pParse->sLastToken.isReserved);
i += pParse->sLastToken.n;
if (i > mxSqlLen) {
- pParse->rc = SQL_TOOBIG;
+ diag_set(ClientError, ER_SQL_PARSER_GENERIC,
+ "string or blob too big");
+ pParse->rc = SQL_TARANTOOL_ERROR;
break;
}
} else {
@@ -501,10 +503,6 @@ sqlRunParser(Parse * pParse, const char *zSql, char **pzErrMsg)
if (tokenType >= TK_SPACE) {
assert(tokenType == TK_SPACE
|| tokenType == TK_ILLEGAL);
- if (db->u1.isInterrupted) {
- pParse->rc = SQL_INTERRUPT;
- break;
- }
if (tokenType == TK_ILLEGAL) {
diag_set(ClientError, ER_SQL_UNKNOWN_TOKEN,
pParse->sLastToken.n,
@@ -529,7 +527,7 @@ sqlRunParser(Parse * pParse, const char *zSql, char **pzErrMsg)
#endif /* YYDEBUG */
sqlParserFree(pEngine, sql_free);
if (db->mallocFailed) {
- pParse->rc = SQL_NOMEM;
+ pParse->rc = SQL_TARANTOOL_ERROR;
}
if (pParse->rc != SQL_OK && pParse->rc != SQL_DONE
&& pParse->zErrMsg == 0) {
diff --git a/src/box/sql/util.c b/src/box/sql/util.c
index c89e2e8abc..a6d1f5cea9 100644
--- a/src/box/sql/util.c
+++ b/src/box/sql/util.c
@@ -211,7 +211,8 @@ sqlErrorWithMsg(sql * db, int err_code, const char *zFormat, ...)
}
/*
- * Add an error message to pParse->zErrMsg and increment pParse->nErr.
+ * Add an error to the diagnostics area, increment pParse->nErr
+ * and set pParse->rc.
* The following formatting characters are allowed:
*
* %s Insert a string
@@ -236,10 +237,10 @@ sqlErrorMsg(Parse * pParse, const char *zFormat, ...)
va_start(ap, zFormat);
zMsg = sqlVMPrintf(db, zFormat, ap);
va_end(ap);
+ diag_set(ClientError, ER_SQL_PARSER_GENERIC, zMsg);
+ sqlDbFree(db, zMsg);
pParse->nErr++;
- sqlDbFree(db, pParse->zErrMsg);
- pParse->zErrMsg = zMsg;
- pParse->rc = SQL_ERROR;
+ pParse->rc = SQL_TARANTOOL_ERROR;
}
void
diff --git a/test/box/misc.result b/test/box/misc.result
index 27579c6a57..9f0b2c73ac 100644
--- a/test/box/misc.result
+++ b/test/box/misc.result
@@ -514,6 +514,7 @@ t;
182: box.error.SQL_STATEMENT_EMPTY
184: box.error.SQL_UNRECOGNIZED_SYNTAX
185: box.error.SQL_UNKNOWN_TOKEN
+ 186: box.error.SQL_PARSER_GENERIC
...
test_run:cmd("setopt delimiter ''");
---
diff --git a/test/sql-tap/check.test.lua b/test/sql-tap/check.test.lua
index b6b7fc7af6..bab64937f2 100755
--- a/test/sql-tap/check.test.lua
+++ b/test/sql-tap/check.test.lua
@@ -319,7 +319,7 @@ test:do_catchsql_test(
);
]], {
-- <check-3.1>
- 1, "Failed to create space 'T3': SQL error: subqueries prohibited in CHECK constraints"
+ 1, "Failed to create space 'T3': subqueries prohibited in CHECK constraints"
-- </check-3.1>
})
diff --git a/test/sql/triggers.result b/test/sql/triggers.result
index 2f5b148033..826e998e15 100644
--- a/test/sql/triggers.result
+++ b/test/sql/triggers.result
@@ -398,14 +398,14 @@ space_id = box.space.T1.id
...
box.sql.execute("CREATE TRIGGER tr1 AFTER INSERT ON t1 WHEN new.a = ? BEGIN SELECT 1; END;")
---
-- error: 'SQL error: bindings are not allowed in DDL'
+- error: bindings are not allowed in DDL
...
tuple = {"TR1", space_id, {sql = [[CREATE TRIGGER tr1 AFTER INSERT ON t1 WHEN new.a = ? BEGIN SELECT 1; END;]]}}
---
...
box.space._trigger:insert(tuple)
---
-- error: 'SQL error: bindings are not allowed in DDL'
+- error: bindings are not allowed in DDL
...
box.sql.execute("DROP TABLE t1;")
---
--
GitLab