[tarantool-patches] [PATCH v1 0/2] sql: remove error ER_SQL
imeevma at tarantool.org
imeevma at tarantool.org
Wed Apr 24 22:57:47 MSK 2019
This patch removes the ER_SQL error code. If we apply only the
"sql: remove error ER_SQL" patch, then some errors will have
"Failed to execute SQL statement: Failed to execute SQL statement:
..." in their descriptions. Instead of fixing this, I decided to
remove SQL_TARANTOOL_*_FAIL SQL errors as this is related to issue
#4074.
https://github.com/tarantool/tarantool/tree/imeevma/small-patches
Mergen Imeev (2):
sql: remove errors SQL_TARANTOOL_*_FAIL
sql: remove error ER_SQL
src/box/alter.cc | 4 +--
src/box/errcode.h | 2 +-
src/box/sql.c | 37 ++++++++--------------
src/box/sql/build.c | 2 +-
src/box/sql/delete.c | 4 +--
src/box/sql/main.c | 3 --
src/box/sql/resolve.c | 2 +-
src/box/sql/sqlInt.h | 3 --
src/box/sql/tarantoolInt.h | 5 +--
src/box/sql/trigger.c | 6 ++--
src/box/sql/vdbe.c | 2 +-
test/box/misc.result | 1 -
test/sql-tap/autoinc.test.lua | 2 +-
test/sql-tap/gh-2931-savepoints.test.lua | 4 +--
.../gh-3307-xfer-optimization-issue.test.lua | 10 +++---
test/sql-tap/gh2259-in-stmt-trans.test.lua | 8 ++---
test/sql-tap/gh2964-abort.test.lua | 2 +-
test/sql-tap/intpkey.test.lua | 2 +-
test/sql-tap/misc1.test.lua | 2 +-
test/sql-tap/select3.test.lua | 2 +-
test/sql-tap/select5.test.lua | 10 +++---
test/sql-tap/table.test.lua | 8 ++---
test/sql-tap/tkt-4a03edc4c8.test.lua | 2 +-
test/sql-tap/trigger1.test.lua | 6 ++--
test/sql-tap/unique.test.lua | 10 +++---
test/sql/collation.result | 18 ++++-------
test/sql/delete.result | 7 ++--
test/sql/errinj.result | 6 ++--
test/sql/foreign-keys.result | 3 +-
test/sql/insert-unique.result | 6 ++--
test/sql/iproto.result | 3 +-
test/sql/on-conflict.result | 4 +--
test/sql/persistency.result | 6 ++--
test/sql/transition.result | 6 ++--
test/sql/triggers.result | 21 ++++++------
35 files changed, 95 insertions(+), 124 deletions(-)
--
2.7.4
More information about the Tarantool-patches
mailing list