[asterisk-commits] tilghman: branch 1.8 r284473 - in /branches/1.8: ./ res/res_config_pgsql.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Sep  1 13:16:37 2010
New Revision: 284473

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=284473
Log:
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
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/res/res_config_pgsql.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/res/res_config_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_config_pgsql.c?view=diff&rev=284473&r1=284472&r2=284473
==============================================================================
--- branches/1.8/res/res_config_pgsql.c (original)
+++ branches/1.8/res/res_config_pgsql.c Wed Sep  1 13:16:37 2010
@@ -1179,12 +1179,16 @@
 							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;