Tarantool development patches archive
 help / color / mirror / Atom feed
* [tarantool-patches] [PATCH v1 0/2] sql: remove error ER_SQL
@ 2019-04-24 19:57 imeevma
  2019-04-24 19:57 ` [tarantool-patches] [PATCH v1 1/2] sql: remove errors SQL_TARANTOOL_*_FAIL imeevma
  2019-04-24 19:57 ` [tarantool-patches] [PATCH v1 2/2] sql: remove error ER_SQL imeevma
  0 siblings, 2 replies; 3+ messages in thread
From: imeevma @ 2019-04-24 19:57 UTC (permalink / raw)
  To: korablev; +Cc: tarantool-patches

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-04-24 19:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-24 19:57 [tarantool-patches] [PATCH v1 0/2] sql: remove error ER_SQL imeevma
2019-04-24 19:57 ` [tarantool-patches] [PATCH v1 1/2] sql: remove errors SQL_TARANTOOL_*_FAIL imeevma
2019-04-24 19:57 ` [tarantool-patches] [PATCH v1 2/2] sql: remove error ER_SQL imeevma

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox