Merge changes from team/russell/sqlite:

* Add new module, cdr_sqlite3_custom which allows logging custom CDRs into a
  SQLite3 database.  (issue #7149, alerios)
* Add new module, res_config_sqlite, which adds realtime database configuration
  support for SQLite version 2.  I decided that this was ok since we didn't have
  any realtime support for version 3.  If someone ports this to version 3, then
  version 2 support can be removed or marked deprecated.
  (issue #7790, rbarun_proformatique)
* Mark cdr_sqlite as deprecated in favor of cdr_sqlite3_custom.

Also, note that there were other modules on the bug tracker that did not make
the cut because they provided some duplicated functionality.  Those are:

* cdr_sqlite3 (issue #6754, moy)
* cdr_sqlite3 (issue #8694, bsd)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@58866 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 117 insertions, 0 deletions

diff --git a/doc/res_config_sqlite.txt b/doc/res_config_sqlite.txt
new file mode 100644
index 000000000..682dbaa73
--- /dev/null
+++ b/doc/res_config_sqlite.txt
@@ -0,0 +1,117 @@
+/*
+ * res_sqlite - SQLite 2 support for Asterisk
+ * 
+ * This module can be used as a static/RealTime configuration module, and a CDR
+ * handler.  See the Doxygen documentation for a detailed description of the 
+ * module, and the configs/ directory for the sample configuration file.
+ */
+
+/*
+ * Tables for res_config_sqlite.so.
+ */
+
+/*
+ * RealTime static table.
+ */
+CREATE TABLE ast_config
+(
+ id INTEGER PRIMARY KEY,
+ commented INT(11) NOT NULL DEFAULT '0',
+ filename VARCHAR(128) NOT NULL,
+ category VARCHAR(128) NOT NULL,
+ var_name VARCHAR(128) NOT NULL,
+ var_val VARCHAR(128) NOT NULL
+);
+
+CREATE INDEX ast_config_filename_commented ON ast_config(filename, commented);
+
+/*
+ * CDR table (this table is automatically created if non existent).
+ * 
+ * CREATE TABLE ast_cdr
+ * (
+ *  id INTEGER PRIMARY KEY,
+ *  clid VARCHAR(80) NOT NULL DEFAULT '',
+ *  src VARCHAR(80) NOT NULL DEFAULT '',
+ *  dst VARCHAR(80) NOT NULL DEFAULT '',
+ *  dcontext VARCHAR(80) NOT NULL DEFAULT '',
+ *  channel VARCHAR(80) NOT NULL DEFAULT '',
+ *  dstchannel VARCHAR(80) NOT NULL DEFAULT '',
+ *  lastapp VARCHAR(80) NOT NULL DEFAULT '',
+ *  lastdata VARCHAR(80) NOT NULL DEFAULT '',
+ *  start CHAR(19) NOT NULL DEFAULT '0000-00-00 00:00:00',
+ *  answer CHAR(19) NOT NULL DEFAULT '0000-00-00 00:00:00',
+ *  end CHAR(19) NOT NULL DEFAULT '0000-00-00 00:00:00',
+ *  duration INT(11) NOT NULL DEFAULT '0',
+ *  billsec INT(11) NOT NULL DEFAULT '0',
+ *  disposition INT(11) NOT NULL DEFAULT '0',
+ *  amaflags INT(11) NOT NULL DEFAULT '0',
+ *  accountcode VARCHAR(20) NOT NULL DEFAULT '',
+ *  uniqueid VARCHAR(32) NOT NULL DEFAULT '',
+ *  userfield VARCHAR(255) NOT NULL DEFAULT ''
+ * );
+ */
+
+/*
+ * SIP RealTime table.
+ */
+CREATE TABLE ast_sip
+(
+ id INTEGER PRIMARY KEY,
+ commented INT(11) NOT NULL DEFAULT '0',
+ name VARCHAR(80) NOT NULL,
+ accountcode VARCHAR(20),
+ amaflags VARCHAR(13),
+ callgroup VARCHAR(10),
+ callerid VARCHAR(80),
+ canreinvite CHAR(3),
+ context VARCHAR(80),
+ defaultip VARCHAR(15),
+ dtmfmode VARCHAR(7),
+ fromuser VARCHAR(80),
+ fromdomain VARCHAR(80),
+ fullcontact VARCHAR(80),
+ host VARCHAR(31) NOT NULL,
+ insecure VARCHAR(4),
+ language CHAR(2),
+ mailbox VARCHAR(50),
+ md5secret VARCHAR(80),
+ nat VARCHAR(5) NOT NULL DEFAULT 'no',
+ deny VARCHAR(95),
+ permit VARCHAR(95),
+ mask VARCHAR(95),
+ pickupgroup VARCHAR(10),
+ port VARCHAR(5) NOT NULL,
+ qualify CHAR(3),
+ restrictcid CHAR(1),
+ rtptimeout CHAR(3),
+ rtpholdtimeout CHAR(3),
+ secret VARCHAR(80),
+ type VARCHAR(6) NOT NULL DEFAULT 'friend',
+ username VARCHAR(80) NOT NULL,
+ disallow VARCHAR(100),
+ allow VARCHAR(100),
+ musiconhold VARCHAR(100),
+ regseconds INT(11) NOT NULL DEFAULT '0',
+ ipaddr VARCHAR(15) NOT NULL,
+ regexten VARCHAR(80) NOT NULL,
+ cancallforward CHAR(3),
+ setvar VARCHAR(100) NOT NULL
+);
+
+CREATE UNIQUE INDEX ast_sip_name ON ast_sip(name);
+
+/*
+ * Dialplan RealTime table.
+ */
+CREATE TABLE ast_exten
+(
+ id INTEGER PRIMARY KEY,
+ commented INT(11) NOT NULL DEFAULT '0',
+ context VARCHAR(20) NOT NULL,
+ exten VARCHAR(20) NOT NULL,
+ priority TINYINT(4) NOT NULL,
+ app VARCHAR(20) NOT NULL,
+ appdata VARCHAR(128) NOT NULL
+);
+