cel/cel_odbc: Provide microsecond precision in 'eventtime' column when possible
authorMatthew Jordan <mjordan@digium.com>
Sat, 15 Nov 2014 21:52:30 +0000 (21:52 +0000)
committerMatthew Jordan <mjordan@digium.com>
Sat, 15 Nov 2014 21:52:30 +0000 (21:52 +0000)
This patch adds microsecond precision when inserting a CEL record into a table
with an "eventtime" column of type timestamp, instead of second precision. The
documentation (configs/cel_odbc.conf.sample) was already saying that the
eventtime column included microseconds precision, but that was not the case.

Also, without this patch, if you had a table with an "eventtime" column of
type varchar, you had millisecond precision. With this patch, you also get
microsecond precision in this case.

Review: https://reviewboard.asterisk.org/r/3980

ASTERISK-24283 #close
Reported by: Etienne Lessard
patches:
  cel_odbc_time_precision.patch uploaded by Etienne Lessard (License 6394)
........

Merged revisions 427952 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 427953 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 427954 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@428010 65c4cc65-6c06-0410-ace0-fbb531ad65f3

cel/cel_odbc.c

index 8b99da1..11e3330 100644 (file)
@@ -436,7 +436,7 @@ static void odbc_log(struct ast_event *event)
                                   This should be ok, however, as nobody is going to store just event
                                   date or just time for CDR purposes.
                                 */
-                               ast_strftime(colbuf, sizeof(colbuf), "%Y-%m-%d %H:%M:%S.%q", &tm);
+                               ast_strftime(colbuf, sizeof(colbuf), "%Y-%m-%d %H:%M:%S.%6q", &tm);
                                colptr = colbuf;
                        } else {
                                if (strcmp(entry->celname, "userdeftype") == 0) {
@@ -615,7 +615,7 @@ static void odbc_log(struct ast_event *event)
                                        if (ast_strlen_zero(colptr)) {
                                                continue;
                                        } else {
-                                               int year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0;
+                                               int year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0, fraction = 0;
                                                if (strcasecmp(entry->name, "eventdate") == 0) {
                                                        struct ast_tm tm;
                                                        ast_localtime(&record.event_time, &tm, tableptr->usegmtime ? "UTC" : NULL);
@@ -625,17 +625,18 @@ static void odbc_log(struct ast_event *event)
                                                        hour = tm.tm_hour;
                                                        minute = tm.tm_min;
                                                        second = (tableptr->allowleapsec || tm.tm_sec < 60) ? tm.tm_sec : 59;
+                                                       fraction = tm.tm_usec;
                                                } else {
-                                                       int count = sscanf(colptr, "%4d-%2d-%2d %2d:%2d:%2d", &year, &month, &day, &hour, &minute, &second);
+                                                       int count = sscanf(colptr, "%4d-%2d-%2d %2d:%2d:%2d.%6d", &year, &month, &day, &hour, &minute, &second, &fraction);
 
-                                                       if ((count != 3 && count != 5 && count != 6) || year <= 0 ||
+                                                       if ((count != 3 && count != 5 && count != 6 && count != 7) || year <= 0 ||
                                                                month <= 0 || month > 12 || day < 0 || day > 31 ||
                                                                ((month == 4 || month == 6 || month == 9 || month == 11) && day == 31) ||
                                                                (month == 2 && year % 400 == 0 && day > 29) ||
                                                                (month == 2 && year % 100 == 0 && day > 28) ||
                                                                (month == 2 && year % 4 == 0 && day > 29) ||
                                                                (month == 2 && year % 4 != 0 && day > 28) ||
-                                                               hour > 23 || minute > 59 || second > (tableptr->allowleapsec ? 60 : 59) || hour < 0 || minute < 0 || second < 0) {
+                                                               hour > 23 || minute > 59 || second > (tableptr->allowleapsec ? 60 : 59) || hour < 0 || minute < 0 || second < 0 || fraction < 0) {
                                                                ast_log(LOG_WARNING, "CEL variable %s is not a valid timestamp ('%s').\n", entry->name, colptr);
                                                                continue;
                                                        }
@@ -647,7 +648,7 @@ static void odbc_log(struct ast_event *event)
 
                                                ast_str_append(&sql, 0, "%s%s", first ? "" : ",", entry->name);
                                                LENGTHEN_BUF2(27);
-                                               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.%d'}", first ? "" : ",", year, month, day, hour, minute, second, fraction);
                                        }
                                        break;
                                case SQL_INTEGER: