[asterisk-commits] jrose: trunk r326694 - in /trunk: ./ res/res_config_odbc.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Jul  7 11:18:18 2011
New Revision: 326694

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=326694
Log:
Merged revisions 326689 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r326689 | jrose | 2011-07-07 11:04:51 -0500 (Thu, 07 Jul 2011) | 10 lines
  
  res_odbc patch by tilghman to fix integers with null values
  
  Addresses some improper sql statements in res_odbc that would cause an update to fail on
  realtime peers due to trying to set as "(NULL)" rather than an actual NULL.
  
  (closes issue #1922STERISK-17791)
  Reported by: marcelloceschia
  Patches: 
        20110505__issue19223.diff.txt uploaded by tilghman (license 14)
........

Modified:
    trunk/   (props changed)
    trunk/res/res_config_odbc.c

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

Modified: trunk/res/res_config_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_config_odbc.c?view=diff&rev=326694&r1=326693&r2=326694
==============================================================================
--- trunk/res/res_config_odbc.c (original)
+++ trunk/res/res_config_odbc.c Thu Jul  7 11:18:18 2011
@@ -481,7 +481,7 @@
 	va_list aq;
 	struct custom_prepare_struct cps = { .sql = sql, .extra = lookup };
 	struct odbc_cache_tables *tableptr;
-	struct odbc_cache_columns *column;
+	struct odbc_cache_columns *column = NULL;
 	struct ast_flags connected_flag = { RES_ODBC_CONNECTED };
 
 	if (!table) {
@@ -519,7 +519,16 @@
 	while((newparam = va_arg(aq, const char *))) {
 		va_arg(aq, const char *);
 		if ((tableptr && (column = ast_odbc_find_column(tableptr, newparam))) || count > 63) {
-			snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), ", %s=?", newparam);
+			/* NULL test for integer-based columns */
+			if (ast_strlen_zero(newparam) && tableptr && column && column->nullable && count < 64 &&
+				(column->type == SQL_INTEGER || column->type == SQL_BIGINT ||
+				 column->type == SQL_SMALLINT || column->type == SQL_TINYINT ||
+				 column->type == SQL_NUMERIC || column->type == SQL_DECIMAL)) {
+				snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), ", %s=NULL", newparam);
+				cps.skip |= (1LL << count);
+			} else {
+				snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), ", %s=?", newparam);
+			}
 		} else { /* the column does not exist in the table */
 			cps.skip |= (1LL << count);
 		}