kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 19:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increase column size beyond the minimum required, since PostgreSQL won't let

Browse Source 
us modify existing columns.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134925 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-31 20:10:39 +00:00
parent 5aa43c0afe
commit 52b2aeb679
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/res_config_pgsql.c
View File

@@ -991,7 +991,12 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap
PGresult *res;
if (requirements == RQ_CREATECHAR || type == RQ_CHAR) {
snprintf(fieldtype, sizeof(fieldtype), "CHAR(%d)", size);
/* Size is minimum length; make it at least 50% greater,
* just to be sure, because PostgreSQL doesn't support
* resizing columns. */
snprintf(fieldtype, sizeof(fieldtype), "CHAR(%d)",
size < 15 ? size * 2 :
(size * 3 / 2 > 255) ? 255 : size * 3 / 2);
} else if (type == RQ_INTEGER1 || type == RQ_UINTEGER1 || type == RQ_INTEGER2) {
snprintf(fieldtype, sizeof(fieldtype), "INT2");
} else if (type == RQ_UINTEGER2 || type == RQ_INTEGER3 || type == RQ_UINTEGER3 || type == RQ_INTEGER4) {
@@ -1008,6 +1013,7 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap
} else if (type == RQ_DATETIME) {
snprintf(fieldtype, sizeof(fieldtype), "TIMESTAMP");
} else {
ast_log(LOG_ERROR, "Unrecognized request type %d\n", type);
ast_free(sql);
continue;
}
@@ -1042,22 +1048,22 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap
static int unload_pgsql(const char *database, const char *tablename)
{
struct tables *cur;
ast_debug(1, "About to lock table cache list\n");
ast_debug(2, "About to lock table cache list\n");
AST_LIST_LOCK(&psql_tables);
ast_debug(1, "About to traverse table cache list\n");
ast_debug(2, "About to traverse table cache list\n");
AST_LIST_TRAVERSE_SAFE_BEGIN(&psql_tables, cur, list) {
if (strcmp(cur->name, tablename) == 0) {
ast_debug(1, "About to remove matching cache entry\n");
ast_debug(2, "About to remove matching cache entry\n");
AST_LIST_REMOVE_CURRENT(list);
ast_debug(1, "About to destroy matching cache entry\n");
ast_debug(2, "About to destroy matching cache entry\n");
destroy_table(cur);
ast_debug(1, "Cache entry destroyed\n");
ast_debug(1, "Cache entry '%s@%s' destroyed\n", tablename, database);
break;
}
}
AST_LIST_TRAVERSE_SAFE_END
AST_LIST_UNLOCK(&psql_tables);
ast_debug(1, "About to return\n");
ast_debug(2, "About to return\n");
return cur ? 0 : -1;
}