php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' into PHP-5.6

Browse Source 
* PHP-5.5:
  Refactor build_tablename()
This commit is contained in:
Yasuo Ohgaki
2014-02-16 07:52:00 +09:00
parent 53f34bca76 f9537c2a0b
commit a12c896dba
1 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/pgsql/pgsql.c
+8 -27
View File
@@ -1054,26 +1054,6 @@ static int _php_pgsql_detect_identifier_escape(const char *identifier, size_t le
}
/* {{{ _php_pgsql_strndup, no strndup should be used */
static char *_php_pgsql_strndup(const char *s, size_t len)
{
char *new;
if (NULL == s) {
return (char *)NULL;
}
new = (char *) malloc(len + 1);
if (NULL == new) {
return (char *)NULL;
}
new[len] = '\0';
return memmove(new, s, len);
}
/* }}} */
/* {{{ PHP_INI
*/
@@ -6214,23 +6194,24 @@ static inline void build_tablename(smart_str *querystr, PGconn *pg_link, const c
token = php_strtok_r(table_copy, ".", &tmp);
len = strlen(token);
if (_php_pgsql_detect_identifier_escape(token, len) == SUCCESS) {
escaped = _php_pgsql_strndup(token, len);
smart_str_appendl(querystr, token, len);
} else {
escaped = PGSQLescapeIdentifier(pg_link, token, len);
smart_str_appends(querystr, escaped);
PGSQLfree(escaped);
}
smart_str_appends(querystr, escaped);
PGSQLfree(escaped);
if (tmp && *tmp) {
len = strlen(tmp);
/* "schema"."table" format */
if (_php_pgsql_detect_identifier_escape(tmp, len) == SUCCESS) {
escaped = _php_pgsql_strndup(tmp, len);
smart_str_appendc(querystr, '.');
smart_str_appendl(querystr, tmp, len);
} else {
escaped = PGSQLescapeIdentifier(pg_link, tmp, len);
smart_str_appendc(querystr, '.');
smart_str_appends(querystr, escaped);
PGSQLfree(escaped);
}
smart_str_appendc(querystr, '.');
smart_str_appends(querystr, escaped);
PGSQLfree(escaped);
}
efree(table_copy);
}