[svn-commits] kpfleming: branch 1.4 r62807 - in /branches/1.4: ./ res/res_config_odbc.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Wed May  2 19:02:57 2007
New Revision: 62807

URL: http://svn.digium.com/view/asterisk?view=rev&rev=62807
Log:
Merged revisions 62796 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r62796 | kpfleming | 2007-05-02 19:53:46 -0400 (Wed, 02 May 2007) | 7 lines

increase reliability and efficiency of static Realtime config loading via ODBC:
	don't request fields we aren't going to use
	don't request sorting on fields that are pointless to sort on
	explicitly request the fields we want, because we can't expect the database to always return them in the order they were created
	
(reported by blitzrage in person (!), patch by me)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/res/res_config_odbc.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/res/res_config_odbc.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_config_odbc.c?view=diff&rev=62807&r1=62806&r2=62807
==============================================================================
--- branches/1.4/res/res_config_odbc.c (original)
+++ branches/1.4/res/res_config_odbc.c Wed May  2 19:02:57 2007
@@ -442,11 +442,7 @@
 
 struct config_odbc_obj {
 	char *sql;
-	unsigned long id;
 	unsigned long cat_metric;
-	unsigned long var_metric;
-	unsigned long commented;
-	char filename[128];
 	char category[128];
 	char var_name[128];
 	char var_val[1024]; /* changed from 128 to 1024 via bug 8251 */
@@ -474,14 +470,10 @@
 		return NULL;
 	}
 
-	SQLBindCol(sth, 1, SQL_C_ULONG, &q->id, sizeof(q->id), &q->err);
-	SQLBindCol(sth, 2, SQL_C_ULONG, &q->cat_metric, sizeof(q->cat_metric), &q->err);
-	SQLBindCol(sth, 3, SQL_C_ULONG, &q->var_metric, sizeof(q->var_metric), &q->err);
-	SQLBindCol(sth, 4, SQL_C_ULONG, &q->commented, sizeof(q->commented), &q->err);
-	SQLBindCol(sth, 5, SQL_C_CHAR, q->filename, sizeof(q->filename), &q->err);
-	SQLBindCol(sth, 6, SQL_C_CHAR, q->category, sizeof(q->category), &q->err);
-	SQLBindCol(sth, 7, SQL_C_CHAR, q->var_name, sizeof(q->var_name), &q->err);
-	SQLBindCol(sth, 8, SQL_C_CHAR, q->var_val, sizeof(q->var_val), &q->err);
+	SQLBindCol(sth, 1, SQL_C_ULONG, &q->cat_metric, sizeof(q->cat_metric), &q->err);
+	SQLBindCol(sth, 2, SQL_C_CHAR, q->category, sizeof(q->category), &q->err);
+	SQLBindCol(sth, 3, SQL_C_CHAR, q->var_name, sizeof(q->var_name), &q->err);
+	SQLBindCol(sth, 4, SQL_C_CHAR, q->var_val, sizeof(q->var_val), &q->err);
 
 	return sth;
 }
@@ -492,9 +484,11 @@
 	struct ast_category *cur_cat;
 	int res = 0;
 	struct odbc_obj *obj;
-	char sql[255] = "";
+	char sqlbuf[1024] = "";
+	char *sql;
+	size_t sqlleft = sizeof(sqlbuf);
 	unsigned int last_cat_metric = 0;
-	SQLSMALLINT rowcount=0;
+	SQLSMALLINT rowcount = 0;
 	SQLHSTMT stmt;
 	char last[128] = "";
 	struct config_odbc_obj q;
@@ -508,8 +502,10 @@
 	if (!obj)
 		return NULL;
 
-	snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE filename='%s' and commented=0 ORDER BY filename,cat_metric desc,var_metric asc,category,var_name,var_val,id", table, file);
-	q.sql = sql;
+	ast_build_string(&sql, &sqlleft, "SELECT cat_metric, category, var_name, var_val FROM %s ", table);
+	ast_build_string(&sql, &sqlleft, "WHERE filename='%s' AND commented=0 ", file);
+	ast_build_string(&sql, &sqlleft, "ORDER BY cat_metric DESC, var_metric ASC, category, var_name ");
+	q.sql = sqlbuf;
 
 	stmt = ast_odbc_prepare_and_execute(obj, config_odbc_prepare, &q);