Merged revisions 284473 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 1 Sep 2010 18:19:12 +0000 (18:19 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 1 Sep 2010 18:19:12 +0000 (18:19 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r284473 | tilghman | 2010-09-01 13:16:37 -0500 (Wed, 01 Sep 2010) | 12 lines

  Merged revisions 284472 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r284472 | tilghman | 2010-09-01 13:13:35 -0500 (Wed, 01 Sep 2010) | 5 lines

    Don't warn on floats and timestamps

    (closes issue #17082)
    Reported by: coolmig
  ........
................

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

res/res_config_pgsql.c

index e356e8f..b4398e8 100644 (file)
@@ -1179,12 +1179,16 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap
                                                        size, column->type);
                                                res = -1;
                                        }
-                               } else if (strncmp(column->type, "float", 5) == 0 && !ast_rq_is_int(type) && type != RQ_FLOAT) {
-                                       ast_log(LOG_WARNING, "Column %s cannot be a %s\n", column->name, column->type);
-                                       res = -1;
-                               } else if (strncmp(column->type, "timestamp", 9) == 0 && type != RQ_DATETIME) {
-                                       ast_log(LOG_WARNING, "Column %s cannot be a %s\n", column->name, column->type);
-                                       res = -1;
+                               } else if (strncmp(column->type, "float", 5) == 0) {
+                                       if (!ast_rq_is_int(type) && type != RQ_FLOAT) {
+                                               ast_log(LOG_WARNING, "Column %s cannot be a %s\n", column->name, column->type);
+                                               res = -1;
+                                       }
+                               } else if (strncmp(column->type, "timestamp", 9) == 0) {
+                                       if (type != RQ_DATETIME && type != RQ_DATE) {
+                                               ast_log(LOG_WARNING, "Column %s cannot be a %s\n", column->name, column->type);
+                                               res = -1;
+                                       }
                                } else { /* There are other types that no module implements yet */
                                        ast_log(LOG_WARNING, "Possibly unsupported column type '%s' on column '%s'\n", column->type, column->name);
                                        res = -1;