[tarantool-patches] Re: [PATCH 2/2] sql: remove unused SQLITE_CONSTRAINT_ error codes

[Vladislav Shpilevoy]

Thanks for the patch!

On 02/10/2018 23:50, AlexeyIvushkin wrote:
> From: Morgan-iv <ivushkinalex at gmail.com>
> 
> Remove SQLITE_CONSTRAINT_ error codes that only defined, but don't used
> anywhere. Change its implementation from define macro to enum statement.
> 
> Part of #3315
> ---
>   src/box/sql/main.c      |  9 ---------
>   src/box/sql/sqliteInt.h | 13 ++++++-------
>   2 files changed, 6 insertions(+), 16 deletions(-)
> 
> diff --git a/src/box/sql/sqliteInt.h b/src/box/sql/sqliteInt.h
> index 00c0309..5c031e1 100644
> --- a/src/box/sql/sqliteInt.h
> +++ b/src/box/sql/sqliteInt.h
> @@ -619,13 +619,12 @@ enum sql_ioerr_code {
>   	SQLITE_IOERR_GETTEMPPATH       = (SQLITE_IOERR | (11<<8))
>   };
>   
> -#define SQLITE_CONSTRAINT_CHECK        (SQLITE_CONSTRAINT | (1<<8))
> -#define SQLITE_CONSTRAINT_FOREIGNKEY   (SQLITE_CONSTRAINT | (3<<8))
> -#define SQLITE_CONSTRAINT_FUNCTION     (SQLITE_CONSTRAINT | (4<<8))
> -#define SQLITE_CONSTRAINT_NOTNULL      (SQLITE_CONSTRAINT | (5<<8))
> -#define SQLITE_CONSTRAINT_PRIMARYKEY   (SQLITE_CONSTRAINT | (6<<8))

1. Still visible here:

tarantool/test/sql-tap/unique.test.lua:
    75      })
    76
    77: -- verify_ex_errcode unique-1.3b SQLITE_CONSTRAINT_PRIMARYKEY
    78  test:do_execsql_test(
    79      "unique-1.4",

> -#define SQLITE_CONSTRAINT_TRIGGER      (SQLITE_CONSTRAINT | (7<<8))
> -#define SQLITE_CONSTRAINT_UNIQUE       (SQLITE_CONSTRAINT | (8<<8))

2. The same.

> +enum sql_constrant_code {
> +	SQLITE_CONSTRAINT_CHECK        = (SQLITE_CONSTRAINT | (1<<8)),
> +	SQLITE_CONSTRAINT_FOREIGNKEY   = (SQLITE_CONSTRAINT | (2<<8)),
> +	SQLITE_CONSTRAINT_NOTNULL      = (SQLITE_CONSTRAINT | (3<<8)),
> +	SQLITE_CONSTRAINT_TRIGGER      = (SQLITE_CONSTRAINT | (4<<8))
> +};
>   
>   enum sql_type {
>   	SQLITE_INTEGER = 1,
>