Skip to content

Commit

Permalink
sql: make type string case lower everywhere
Browse files Browse the repository at this point in the history 
Type was displayed in error messages, was returned in
meta headers, and a type string is a result of
typeof() SQL function.

Typeof() always returns lower case type string; meta
contained upper case type; error messages contained
both.

It was necessary to choose one case for everything,
and the lower one was chosen. It allows not to break
typeof() function which actually might be used by
someone.
  • Loading branch information
@Gerold103 @Korablev77
Gerold103 authored and Korablev77 committed Nov 7, 2019
1 parent d56d869 commit ee60d31
Show file tree
Hide file tree
Showing 18 changed files with 430 additions and 429 deletions.
2 changes: 1 addition & 1 deletion src/box/sql/delete.c
View file
Expand Up @@ -420,7 +420,7 @@ sql_table_delete_from(struct Parse *parse, struct SrcList *tab_list,
sqlVdbeSetNumCols(v, 1);
sqlVdbeSetColName(v, 0, COLNAME_NAME, "rows deleted",
SQL_STATIC);
sqlVdbeSetColName(v, 0, COLNAME_DECLTYPE, "INTEGER",
sqlVdbeSetColName(v, 0, COLNAME_DECLTYPE, "integer",
SQL_STATIC);
}

Expand Down
11 changes: 6 additions & 5 deletions src/box/sql/func.c
View file
Expand Up @@ -559,7 +559,8 @@ position_func(struct sql_context *context, int argc, struct Mem **argv)
if (haystack_type != MP_STR && haystack_type != MP_BIN)
inconsistent_type_arg = haystack;
if (inconsistent_type_arg != NULL) {
diag_set(ClientError, ER_INCONSISTENT_TYPES, "TEXT or VARBINARY",
diag_set(ClientError, ER_INCONSISTENT_TYPES,
"text or varbinary",
mem_type_to_str(inconsistent_type_arg));
context->is_aborted = true;
return;
Expand Down Expand Up @@ -889,8 +890,8 @@ case_type##ICUFunc(sql_context *context, int argc, sql_value **argv) \
UNUSED_PARAMETER(argc); \
int arg_type = sql_value_type(argv[0]); \
if (arg_type == MP_BIN) { \
diag_set(ClientError, ER_INCONSISTENT_TYPES, "TEXT", \
"VARBINARY"); \
diag_set(ClientError, ER_INCONSISTENT_TYPES, "text", \
"varbinary"); \
context->is_aborted = true; \
return; \
} \
Expand Down Expand Up @@ -1225,7 +1226,7 @@ likeFunc(sql_context *context, int argc, sql_value **argv)
char *inconsistent_type = rhs_type != MP_STR ?
mem_type_to_str(argv[0]) :
mem_type_to_str(argv[1]);
diag_set(ClientError, ER_INCONSISTENT_TYPES, "TEXT",
diag_set(ClientError, ER_INCONSISTENT_TYPES, "text",
inconsistent_type);
context->is_aborted = true;
return;
Expand Down Expand Up @@ -1860,7 +1861,7 @@ soundexFunc(sql_context * context, int argc, sql_value ** argv)
assert(argc == 1);
if (sql_value_type(argv[0]) == MP_BIN) {
diag_set(ClientError, ER_SQL_TYPE_MISMATCH,
sql_value_to_diag_str(argv[0]), "TEXT");
sql_value_to_diag_str(argv[0]), "text");
context->is_aborted = true;
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/box/sql/insert.c
View file
Expand Up @@ -786,7 +786,7 @@ sqlInsert(Parse * pParse, /* Parser context */
else
column_name = "rows inserted";
sqlVdbeSetColName(v, 0, COLNAME_NAME, column_name, SQL_STATIC);
sqlVdbeSetColName(v, 0, COLNAME_DECLTYPE, "INTEGER",
sqlVdbeSetColName(v, 0, COLNAME_DECLTYPE, "integer",
SQL_STATIC);
}

Expand Down
4 changes: 2 additions & 2 deletions src/box/sql/pragma.c
View file
Expand Up @@ -169,9 +169,9 @@ vdbe_emit_pragma_status(struct Parse *parse)

sqlVdbeSetNumCols(v, 2);
sqlVdbeSetColName(v, 0, COLNAME_NAME, "pragma_name", SQL_STATIC);
sqlVdbeSetColName(v, 0, COLNAME_DECLTYPE, "TEXT", SQL_STATIC);
sqlVdbeSetColName(v, 0, COLNAME_DECLTYPE, "text", SQL_STATIC);
sqlVdbeSetColName(v, 1, COLNAME_NAME, "pragma_value", SQL_STATIC);
sqlVdbeSetColName(v, 1, COLNAME_DECLTYPE, "INTEGER", SQL_STATIC);
sqlVdbeSetColName(v, 1, COLNAME_DECLTYPE, "integer", SQL_STATIC);

parse->nMem = 2;
for (int i = 0; i < ArraySize(aPragmaName); ++i) {
Expand Down
92 changes: 46 additions & 46 deletions src/box/sql/pragma.h
View file
Expand Up @@ -31,119 +31,119 @@
static const char *const pragCName[] = {
/* Used by: table_info */
/* 0 */ "cid",
/* 1 */ "INTEGER",
/* 1 */ "integer",
/* 2 */ "name",
/* 3 */ "TEXT",
/* 3 */ "text",
/* 4 */ "type",
/* 3 */ "TEXT",
/* 3 */ "text",
/* 6 */ "notnull",
/* 1 */ "INTEGER",
/* 1 */ "integer",
/* 8 */ "dflt_value",
/* 9 */ "TEXT",
/* 9 */ "text",
/* 10 */ "pk",
/* 11 */ "INTEGER",
/* 11 */ "integer",
/* Used by: stats */
/* 12 */ "table",
/* 13 */ "TEXT",
/* 13 */ "text",
/* 14 */ "index",
/* 15 */ "TEXT",
/* 15 */ "text",
/* 16 */ "width",
/* 17 */ "INTEGER",
/* 17 */ "integer",
/* 18 */ "height",
/* 19 */ "INTEGER",
/* 19 */ "integer",
/* Used by: index_info */
/* 20 */ "seqno",
/* 21 */ "INTEGER",
/* 21 */ "integer",
/* 22 */ "cid",
/* 23 */ "INTEGER",
/* 23 */ "integer",
/* 24 */ "name",
/* 25 */ "TEXT",
/* 25 */ "text",
/* 26 */ "desc",
/* 27 */ "INTEGER",
/* 27 */ "integer",
/* 28 */ "coll",
/* 29 */ "TEXT",
/* 29 */ "text",
/* 30 */ "type",
/* 31 */ "TEXT",
/* 31 */ "text",
/* Used by: index_list */
/* 32 */ "seq",
/* 33 */ "INTEGER",
/* 33 */ "integer",
/* 34 */ "name",
/* 35 */ "TEXT",
/* 35 */ "text",
/* 36 */ "unique",
/* 37 */ "INTEGER",
/* 37 */ "integer",
/* Used by: collation_list */
/* 38 */ "seq",
/* 39 */ "INTEGER",
/* 39 */ "integer",
/* 40 */ "name",
/* 41 */ "TEXT",
/* 41 */ "text",
/* Used by: foreign_key_list */
/* 42 */ "id",
/* 43 */ "INTEGER",
/* 43 */ "integer",
/* 44 */ "seq",
/* 45 */ "INTEGER",
/* 45 */ "integer",
/* 46 */ "table",
/* 47 */ "TEXT",
/* 47 */ "text",
/* 48 */ "from",
/* 49 */ "TEXT",
/* 49 */ "text",
/* 50 */ "to",
/* 51 */ "TEXT",
/* 51 */ "text",
/* 52 */ "on_update",
/* 53 */ "TEXT",
/* 53 */ "text",
/* 54 */ "on_delete",
/* 55 */ "TEXT",
/* 55 */ "text",
/* 56 */ "match",
/* 57 */ "TEXT",
/* 57 */ "text",
/* Used by: count_changes */
/* 58 */ "count_changes",
/* 59 */ "INTEGER",
/* 59 */ "integer",
/* Used by: defer_foreign_keys */
/* 60 */ "defer_foreign_keys",
/* 61 */ "INTEGER",
/* 61 */ "integer",
/* Used by: full_column_names */
/* 62 */ "full_column_names",
/* 63 */ "INTEGER",
/* 63 */ "integer",
/* Used by: parser_trace */
/* 64 */ "parser_trace",
/* 65 */ "INTEGER",
/* 65 */ "integer",
/* Used by: recursive_triggers */
/* 66 */ "recursive_triggers",
/* 67 */ "INTEGER",
/* 67 */ "integer",
/* Used by: reverse_unordered_selects */
/* 68 */ "reverse_unordered_selects",
/* 69 */ "INTEGER",
/* 69 */ "integer",
/* Used by: select_trace */
/* 70 */ "select_trace",
/* 71 */ "INTEGER",
/* 71 */ "integer",
/* Used by: short_column_names */
/* 72 */ "short_column_names",
/* 73 */ "INTEGER",
/* 73 */ "integer",
/* Used by: sql_compound_select_limit */
/* 74 */ "sql_compound_select_limit",
/* 75 */ "INTEGER",
/* 75 */ "integer",
/* Used by: sql_default_engine */
/* 76 */ "sql_default_engine",
/* 77 */ "TEXT",
/* 77 */ "text",
/* Used by: sql_trace */
/* 78 */ "sql_trace",
/* 79 */ "INTEGER",
/* 79 */ "integer",
/* Used by: vdbe_addoptrace */
/* 80 */ "vdbe_addoptrace",
/* 81 */ "INTEGER",
/* 81 */ "integer",
/* Used by: vdbe_debug */
/* 82 */ "vdbe_debug",
/* 83 */ "INTEGER",
/* 83 */ "integer",
/* Used by: vdbe_eqp */
/* 84 */ "vdbe_eqp",
/* 85 */ "INTEGER",
/* 85 */ "integer",
/* Used by: vdbe_listing */
/* 86 */ "vdbe_listing",
/* 87 */ "INTEGER",
/* 87 */ "integer",
/* Used by: vdbe_trace */
/* 88 */ "vdbe_trace",
/* 89 */ "INTEGER",
/* 89 */ "integer",
/* Used by: where_trace */
/* 90 */ "where_trace",
/* 91 */ "INTEGER",
/* 91 */ "integer",
};

/* Definitions of all built-in pragmas */
Expand Down
24 changes: 12 additions & 12 deletions src/box/sql/prepare.c
View file
Expand Up @@ -110,29 +110,29 @@ sqlPrepare(sql * db, /* Database handle. */
if (rc == 0 && sParse.pVdbe != NULL && sParse.explain) {
static const char *const azColName[] = {
/* 0 */ "addr",
/* 1 */ "INTEGER",
/* 1 */ "integer",
/* 2 */ "opcode",
/* 3 */ "TEXT",
/* 3 */ "text",
/* 4 */ "p1",
/* 5 */ "INTEGER",
/* 5 */ "integer",
/* 6 */ "p2",
/* 7 */ "INTEGER",
/* 7 */ "integer",
/* 8 */ "p3",
/* 9 */ "INTEGER",
/* 9 */ "integer",
/* 10 */ "p4",
/* 11 */ "TEXT",
/* 11 */ "text",
/* 12 */ "p5",
/* 13 */ "TEXT",
/* 13 */ "text",
/* 14 */ "comment",
/* 15 */ "TEXT",
/* 15 */ "text",
/* 16 */ "selectid",
/* 17 */ "INTEGER",
/* 17 */ "integer",
/* 18 */ "order",
/* 19 */ "INTEGER",
/* 19 */ "integer",
/* 20 */ "from",
/* 21 */ "INTEGER",
/* 21 */ "integer",
/* 22 */ "detail",
/* 23 */ "TEXT",
/* 23 */ "text",
};

int name_first, name_count;
Expand Down
2 changes: 1 addition & 1 deletion src/box/sql/update.c
View file
Expand Up @@ -500,7 +500,7 @@ sqlUpdate(Parse * pParse, /* The parser context */
sqlVdbeSetNumCols(v, 1);
sqlVdbeSetColName(v, 0, COLNAME_NAME, "rows updated",
SQL_STATIC);
sqlVdbeSetColName(v, 0, COLNAME_DECLTYPE, "INTEGER",
sqlVdbeSetColName(v, 0, COLNAME_DECLTYPE, "integer",
SQL_STATIC);
}

Expand Down
16 changes: 8 additions & 8 deletions src/box/sql/vdbe.c
View file
Expand Up @@ -612,17 +612,17 @@ mem_type_to_str(const struct Mem *p)
case MEM_Null:
return "NULL";
case MEM_Str:
return "TEXT";
return "text";
case MEM_Int:
return "INTEGER";
return "integer";
case MEM_UInt:
return "UNSIGNED";
return "unsigned";
case MEM_Real:
return "REAL";
return "real";
case MEM_Blob:
return "VARBINARY";
return "varbinary";
case MEM_Bool:
return "BOOLEAN";
return "boolean";
default:
unreachable();
}
Expand Down Expand Up @@ -1507,8 +1507,8 @@ case OP_Concat: { /* same as TK_CONCAT, in1, in2, out3 */
char *inconsistent_type = str_type_p1 == 0 ?
mem_type_to_str(pIn1) :
mem_type_to_str(pIn2);
diag_set(ClientError, ER_INCONSISTENT_TYPES, "TEXT or VARBINARY",
inconsistent_type);
diag_set(ClientError, ER_INCONSISTENT_TYPES,
"text or varbinary", inconsistent_type);
goto abort_due_to_error;
}

Expand Down
16 changes: 8 additions & 8 deletions src/box/sql/vdbeapi.c
View file
Expand Up @@ -893,7 +893,7 @@ bindText(sql_stmt * pStmt, /* The statement to bind against */
pVar = &p->aVar[i - 1];
if (sqlVdbeMemSetStr(pVar, zData, nData, 1, xDel) != 0)
return -1;
return sql_bind_type(p, i, "TEXT");
return sql_bind_type(p, i, "text");
}

/*
Expand All @@ -915,7 +915,7 @@ sql_bind_blob(sql_stmt * pStmt,
struct Mem *var = &p->aVar[i - 1];
if (sqlVdbeMemSetStr(var, zData, nData, 0, xDel) != 0)
return -1;
return sql_bind_type(p, i, "VARBINARY");
return sql_bind_type(p, i, "varbinary");
}

int
Expand All @@ -939,7 +939,7 @@ sql_bind_double(sql_stmt * pStmt, int i, double rValue)
Vdbe *p = (Vdbe *) pStmt;
if (vdbeUnbind(p, i) != 0)
return -1;
int rc = sql_bind_type(p, i, "NUMERIC");
int rc = sql_bind_type(p, i, "numeric");
sqlVdbeMemSetDouble(&p->aVar[i - 1], rValue);
return rc;
}
Expand All @@ -950,7 +950,7 @@ sql_bind_boolean(struct sql_stmt *stmt, int i, bool value)
struct Vdbe *p = (struct Vdbe *) stmt;
if (vdbeUnbind(p, i) != 0)
return -1;
int rc = sql_bind_type(p, i, "BOOLEAN");
int rc = sql_bind_type(p, i, "boolean");
mem_set_bool(&p->aVar[i - 1], value);
return rc;
}
Expand All @@ -967,7 +967,7 @@ sql_bind_int64(sql_stmt * pStmt, int i, sql_int64 iValue)
Vdbe *p = (Vdbe *) pStmt;
if (vdbeUnbind(p, i) != 0)
return -1;
int rc = sql_bind_type(p, i, "INTEGER");
int rc = sql_bind_type(p, i, "integer");
assert(iValue < 0);
mem_set_int(&p->aVar[i - 1], iValue, true);
return rc;
Expand All @@ -979,7 +979,7 @@ sql_bind_uint64(struct sql_stmt *stmt, int i, uint64_t value)
struct Vdbe *p = (struct Vdbe *) stmt;
if (vdbeUnbind(p, i) != 0)
return -1;
int rc = sql_bind_type(p, i, "INTEGER");
int rc = sql_bind_type(p, i, "integer");
mem_set_u64(&p->aVar[i - 1], value);
return rc;
}
Expand All @@ -990,7 +990,7 @@ sql_bind_null(sql_stmt * pStmt, int i)
Vdbe *p = (Vdbe *) pStmt;
if (vdbeUnbind(p, i) != 0)
return -1;
return sql_bind_type(p, i, "BOOLEAN");
return sql_bind_type(p, i, "boolean");
}

int
Expand All @@ -999,7 +999,7 @@ sql_bind_ptr(struct sql_stmt *stmt, int i, void *ptr)
struct Vdbe *p = (struct Vdbe *) stmt;
int rc = vdbeUnbind(p, i);
if (rc == 0) {
rc = sql_bind_type(p, i, "VARBINARY");
rc = sql_bind_type(p, i, "varbinary");
mem_set_ptr(&p->aVar[i - 1], ptr);
}
return rc;
Expand Down

0 comments on commit ee60d31

Please sign in to comment.