[tarantool-patches] [PATCH v2 0/3] Change collation compatibility rules according to ANSI SQL

Nikita Pettik korablev at tarantool.org
Tue Nov 13 03:07:23 MSK 2018


This patch-set introduces rules for collation compatibility in order to
restrict usage of different collations within one comparison.
Originally, SQLite uses doubtful approach: if collations of LHS and RHS
can not be used together, then collation of LHS is chosen.  Such
behaviour quite misleading and results in the fact that swap of LHS and
RHS values may change result of operation.  We've decided to add
restrictions on collations of LHS and RHS to disallow messing different
collations as it is stated in ANSI SQL.

Changes in v2:

Instead of using surrogate ids for "binary" and "none" collations,
now real ones are added to _collation space. They also come with
new collation type - binary. It simply uses memcmp as a collation
rule. For details see second patch in series.

Minor fixes:

- Make collations_are_compatible() be collations_check_compatibility()
  and process diag_set() right there;
- Clean-up debug asserts.

Nikita Pettik (3):
  sql: do not add explicit <COLLATE "BINARY"> clause
  Introduce "none" and "binary" collations
  sql: change collation compatibility rules

 src/box/alter.cc                  |  13 ++++-
 src/box/bootstrap.snap            | Bin 1888 -> 1911 bytes
 src/box/coll_id.c                 |   1 -
 src/box/errcode.h                 |   2 +
 src/box/field_def.c               |   2 +-
 src/box/key_def.c                 |  18 +++---
 src/box/key_def.h                 |   6 --
 src/box/lua/space.cc              |   2 +-
 src/box/lua/upgrade.lua           |   2 +
 src/box/sql.c                     |  10 ++--
 src/box/sql/build.c               |   2 +-
 src/box/sql/callback.c            |  19 +++++--
 src/box/sql/expr.c                |  73 ++++++++++++++++++------
 src/box/sql/fkey.c                |   2 -
 src/box/sql/func.c                |   2 +-
 src/box/sql/select.c              | 117 ++++++++++++++++++++------------------
 src/box/sql/sqliteInt.h           |  28 ++++++++-
 src/box/sql/where.c               |  15 +++--
 src/box/sql/whereexpr.c           |  38 ++++++-------
 src/box/tuple_format.c            |   4 +-
 src/coll.c                        |  52 ++++++++++++++---
 src/coll_def.c                    |   2 +-
 src/coll_def.h                    |   1 +
 test/box/ddl.result               |  20 ++++---
 test/box/misc.result              |   2 +
 test/box/net.box.result           |   2 +-
 test/sql-tap/collation.test.lua   |  12 ++--
 test/sql-tap/distinct.test.lua    |   2 +-
 test/sql-tap/e_select1.test.lua   |  12 ++--
 test/sql-tap/in3.test.lua         |   2 +-
 test/sql-tap/in4.test.lua         |   2 +-
 test/sql-tap/index3.test.lua      |   2 +-
 test/sql-tap/join.test.lua        |   2 +-
 test/sql-tap/tkt3493.test.lua     |   4 +-
 test/sql-tap/transitive1.test.lua |   4 +-
 test/sql-tap/where2.test.lua      |   2 +-
 test/sql-tap/with1.test.lua       |   2 +-
 test/sql/collation.result         |  90 +++++++++++++++++++++++++++++
 test/sql/collation.test.lua       |  36 ++++++++++++
 39 files changed, 427 insertions(+), 180 deletions(-)

-- 
2.15.1





More information about the Tarantool-patches mailing list