From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 5 Jan 2012 23:46:01 +0000 (+0000)
Subject: Make not assume that the cel_sqlite3_custom SQL table primary key is AcctId.
X-Git-Tag: 10.2.0-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b53ea3943740aea17eadbb680115c7b6747e07d;p=thirdparty%2Fasterisk.git

Make not assume that the cel_sqlite3_custom SQL table primary key is AcctId.

If a table is created by some other application and the primary key is not
named "AcctId", cel/cel_sqlite3_custom.c will always try to create the
table and fail because it already exists.

* Change the SQL table query to not require AcctId as the primary key.

(closes issue ASTERISK-18963)
Reported by: socketpair
Patches:
      fix.patch (license #6337) patch uploaded by socketpair
........

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


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

diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index 4596e770e7..e0b0225193 100644
--- a/cel/cel_sqlite3_custom.c
+++ b/cel/cel_sqlite3_custom.c
@@ -321,7 +321,7 @@ static int load_module(void)
 	}
 
 	/* is the table there? */
-	sql = sqlite3_mprintf("SELECT COUNT(AcctId) FROM %q;", table);
+	sql = sqlite3_mprintf("SELECT COUNT(*) FROM %q;", table);
 	res = sqlite3_exec(db, sql, NULL, NULL, NULL);
 	sqlite3_free(sql);
 	if (res != SQLITE_OK) {