kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdr/cdr_adaptive_odbc.c: Refactor concatenate columns name.

Browse Source 
The concatenate for columns name to INSERT INTO is always the same. It is
possible to do it on one line.

ASTERISK-24980

Change-Id: Ib8bb53c42535378581d4ef729cc5ebbb22b067ac
This commit is contained in:
Rodrigo Ramírez Norambuena
2015-04-20 15:40:12 -03:00
committed by Mark Michelson
parent 06ba1e59cb
commit bff3064578
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cdr/cdr_adaptive_odbc.c
View File

@@ -484,7 +484,6 @@ static int odbc_log(struct ast_cdr *cdr)
} }
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(strlen(colptr)); LENGTHEN_BUF2(strlen(colptr));
/* Encode value, with escaping */ /* Encode value, with escaping */
@@ -520,7 +519,6 @@ static int odbc_log(struct ast_cdr *cdr)
year += 2000; year += 2000;
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(17); LENGTHEN_BUF2(17);
ast_str_append(&sql2, 0, "%s{ d '%04d-%02d-%02d' }", first ? "" : ",", year, month, day); ast_str_append(&sql2, 0, "%s{ d '%04d-%02d-%02d' }", first ? "" : ",", year, month, day);
} }
@@ -537,7 +535,6 @@ static int odbc_log(struct ast_cdr *cdr)
continue; continue;
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(15); LENGTHEN_BUF2(15);
ast_str_append(&sql2, 0, "%s{ t '%02d:%02d:%02d' }", first ? "" : ",", hour, minute, second); ast_str_append(&sql2, 0, "%s{ t '%02d:%02d:%02d' }", first ? "" : ",", hour, minute, second);
} }
@@ -566,7 +563,6 @@ static int odbc_log(struct ast_cdr *cdr)
year += 2000; year += 2000;
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(26); LENGTHEN_BUF2(26);
ast_str_append(&sql2, 0, "%s{ ts '%04d-%02d-%02d %02d:%02d:%02d' }", first ? "" : ",", year, month, day, hour, minute, second); ast_str_append(&sql2, 0, "%s{ ts '%04d-%02d-%02d %02d:%02d:%02d' }", first ? "" : ",", year, month, day, hour, minute, second);
} }
@@ -581,7 +577,6 @@ static int odbc_log(struct ast_cdr *cdr)
continue; continue;
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(12); LENGTHEN_BUF2(12);
ast_str_append(&sql2, 0, "%s%d", first ? "" : ",", integer); ast_str_append(&sql2, 0, "%s%d", first ? "" : ",", integer);
} }
@@ -596,7 +591,6 @@ static int odbc_log(struct ast_cdr *cdr)
continue; continue;
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(24); LENGTHEN_BUF2(24);
ast_str_append(&sql2, 0, "%s%lld", first ? "" : ",", integer); ast_str_append(&sql2, 0, "%s%lld", first ? "" : ",", integer);
} }
@@ -611,7 +605,6 @@ static int odbc_log(struct ast_cdr *cdr)
continue; continue;
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(6); LENGTHEN_BUF2(6);
ast_str_append(&sql2, 0, "%s%d", first ? "" : ",", integer); ast_str_append(&sql2, 0, "%s%d", first ? "" : ",", integer);
} }
@@ -626,7 +619,6 @@ static int odbc_log(struct ast_cdr *cdr)
continue; continue;
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(4); LENGTHEN_BUF2(4);
ast_str_append(&sql2, 0, "%s%d", first ? "" : ",", integer); ast_str_append(&sql2, 0, "%s%d", first ? "" : ",", integer);
} }
@@ -643,7 +635,6 @@ static int odbc_log(struct ast_cdr *cdr)
if (integer != 0) if (integer != 0)
integer = 1; integer = 1;
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(2); LENGTHEN_BUF2(2);
ast_str_append(&sql2, 0, "%s%d", first ? "" : ",", integer); ast_str_append(&sql2, 0, "%s%d", first ? "" : ",", integer);
} }
@@ -676,7 +667,6 @@ static int odbc_log(struct ast_cdr *cdr)
continue; continue;
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(entry->decimals); LENGTHEN_BUF2(entry->decimals);
ast_str_append(&sql2, 0, "%s%*.*lf", first ? "" : ",", entry->decimals, entry->radix, number); ast_str_append(&sql2, 0, "%s%*.*lf", first ? "" : ",", entry->decimals, entry->radix, number);
} }
@@ -710,7 +700,6 @@ static int odbc_log(struct ast_cdr *cdr)
continue; continue;
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
LENGTHEN_BUF2(entry->decimals); LENGTHEN_BUF2(entry->decimals);
ast_str_append(&sql2, 0, "%s%lf", first ? "" : ",", number); ast_str_append(&sql2, 0, "%s%lf", first ? "" : ",", number);
} }
@@ -719,6 +708,7 @@ static int odbc_log(struct ast_cdr *cdr)
ast_log(LOG_WARNING, "Column type %d (field '%s:%s:%s') is unsupported at this time.\n", entry->type, tableptr->connection, tableptr->table, entry->name); ast_log(LOG_WARNING, "Column type %d (field '%s:%s:%s') is unsupported at this time.\n", entry->type, tableptr->connection, tableptr->table, entry->name);
continue; continue;
} }
ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
first = 0; first = 0;
} else if (entry->filtervalue } else if (entry->filtervalue
&& ((!entry->negatefiltervalue && entry->filtervalue[0] != '\0') && ((!entry->negatefiltervalue && entry->filtervalue[0] != '\0')