[asterisk-commits] twilson: trunk r340665 - in /trunk: ./ res/res_config_sqlite.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Oct 12 19:17:42 2011
New Revision: 340665

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=340665
Log:
Don't skip the query field on a realtime multi query

There is no documented reason to not add the query field to the varlist
returned by a realtime multi query, despite the config category being
set to its value. Of course, there is no documentation that the category
should be set to the value either. There is lots of no documentation
when it comes to realtime. But, other engines do not skip this field so
I am forcing this backend to follow the convention, because not doing so
is very silly.
........

Merged revisions 340662 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 340663 from http://svn.asterisk.org/svn/asterisk/branches/10

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

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

Modified: trunk/res/res_config_sqlite.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_config_sqlite.c?view=diff&rev=340665&r1=340664&r2=340665
==============================================================================
--- trunk/res/res_config_sqlite.c (original)
+++ trunk/res/res_config_sqlite.c Wed Oct 12 19:17:42 2011
@@ -1154,8 +1154,9 @@
 	ast_category_append(args->cfg, cat);
 
 	for (i = 0; i < argc; i++) {
-		if (!argv[i] || !strcmp(args->initfield, columnNames[i]))
+		if (!argv[i]) {
 			continue;
+		}
 
 		if (!(var = ast_variable_new(columnNames[i], argv[i], ""))) {
 			ast_log(LOG_WARNING, "Unable to allocate variable\n");