archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Cleanup (1-st round)

Browse source
This commit is contained in:
Dmitry Stogov 2014-04-15 15:40:40 +04:00
parent 93d3a613d8
commit 050d7e38ad
139 changed files with 921 additions and 1185 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/pdo_mysql/mysql_statement.c
View file

@ -827,26 +827,26 @@ static int pdo_mysql_stmt_col_meta(pdo_stmt_t *stmt, long colno, zval *return_va
F = S->fields + colno;
if (F->def) {
add_assoc_string(return_value, "mysql:def", F->def, 1);
add_assoc_string(return_value, "mysql:def", F->def);
}
if (IS_NOT_NULL(F->flags)) {
add_next_index_string(flags, "not_null", 1);
add_next_index_string(flags, "not_null");
}
if (IS_PRI_KEY(F->flags)) {
add_next_index_string(flags, "primary_key", 1);
add_next_index_string(flags, "primary_key");
}
if (F->flags & MULTIPLE_KEY_FLAG) {
add_next_index_string(flags, "multiple_key", 1);
add_next_index_string(flags, "multiple_key");
}
if (F->flags & UNIQUE_KEY_FLAG) {
add_next_index_string(flags, "unique_key", 1);
add_next_index_string(flags, "unique_key");
}
if (IS_BLOB(F->flags)) {
add_next_index_string(flags, "blob", 1);
add_next_index_string(flags, "blob");
}
str = type_to_name_native(F->type);
if (str) {
add_assoc_string(return_value, "native_type", str, 1);
add_assoc_string(return_value, "native_type", str);
}
#ifdef PDO_USE_MYSQLND
@ -869,7 +869,7 @@ static int pdo_mysql_stmt_col_meta(pdo_stmt_t *stmt, long colno, zval *return_va
#endif
add_assoc_zval(return_value, "flags", flags);
add_assoc_string(return_value, "table", (char *) (F->table?F->table:""), 1);
add_assoc_string(return_value, "table", (char *) (F->table?F->table:""));
PDO_DBG_RETURN(SUCCESS);
} /* }}} */