[tarantool-patches] Re: [PATCH v2 4/6] sql: fix "PRAGMA case_sensitive_like" result

[n.pettik]

> diff --git a/src/box/sql/pragma.c b/src/box/sql/pragma.c
> index f34e7b8..9390f6f 100644
> --- a/src/box/sql/pragma.c
> +++ b/src/box/sql/pragma.c
> @@ -591,13 +591,20 @@ sqlite3Pragma(Parse * pParse, Token * pId,	/* First part of [schema.]id field */
> 		 * depending on the RHS.
> 		 */
> 	case PragTyp_CASE_SENSITIVE_LIKE:{
> -			if (zRight) {
> -				int is_like_ci =
> -					!(sqlite3GetBoolean(zRight, 0));
> -				sqlite3RegisterLikeFunctions(db, is_like_ci);
> -			}
> -			break;
> +		int mask = pPragma->iArg;
> +		if (zRight == NULL) {
> +			returnSingleInt(v,
> +					(user_session->sql_flags & mask) != 0);
> +		} else {
> +			int is_like_ci = !(sqlite3GetBoolean(zRight, 0));
> +			if (!is_like_ci)
> +				user_session->sql_flags |= mask;
> +			else
> +				user_session->sql_flags &= ~mask;
> +			sqlite3RegisterLikeFunctions(db, is_like_ci);
> 		}

Nit: since pragma is called ‘case_sensitive_like’, I would revert variable
meaning:

+++ b/src/box/sql/pragma.c
@@ -602,12 +602,12 @@ sqlite3Pragma(Parse * pParse, Token * pId,        /* First part of [schema.]id field */
                        returnSingleInt(v,
                                        (user_session->sql_flags & mask) != 0);
                } else {
-                       int is_like_ci = !(sqlite3GetBoolean(zRight, 0));
-                       if (!is_like_ci)
+                       bool is_like_cs = sqlite3GetBoolean(zRight, 0);
+                       if (is_like_cs)
                                user_session->sql_flags |= mask;
                        else
                                user_session->sql_flags &= ~mask;
-                       sqlite3RegisterLikeFunctions(db, is_like_ci);
+                       sqlite3RegisterLikeFunctions(db, ! is_like_cs);

Also, the same question here: why you didn’t make it be of
type ‘flag’? The only difference in additional call of sqlite3RegisterLikeFunctions.


> +		break;
> +	}
> 
> 	case PragTyp_DEFAULT_ENGINE: {
> 		if (zRight == NULL) {
> diff --git a/src/box/sql/pragma.h b/src/box/sql/pragma.h
> index 59e0e1e..11a2e05 100644
> --- a/src/box/sql/pragma.h
> +++ b/src/box/sql/pragma.h
> @@ -94,9 +94,9 @@ static const PragmaName aPragmaName[] = {
> 	 /* iArg:      */ 0},
> 	{ /* zName:     */ "case_sensitive_like",
> 	 /* ePragTyp:  */ PragTyp_CASE_SENSITIVE_LIKE,
> -	 /* ePragFlg:  */ PragFlg_NoColumns,
> +	 /* ePragFlg:  */ PragFlg_Result0 | PragFlg_NoColumns1,
> 	 /* ColNames:  */ 0, 0,
> -	 /* iArg:      */ 0},
> +	 /* iArg:      */ SQLITE_LikeIsCaseSens},

Lets avoid using ’sqlite’ prefixes for added code.