Merged revisions 275909 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r275909 | tilghman | 2010-07-13 09:47:30 -0500 (Tue, 13 Jul 2010) | 2 lines
  
  Move SQL scripts into their own database-specific directories.
........


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

6 files changed, 17 insertions, 41 deletions

diff --git a/contrib/scripts/iax-friends.sql b/contrib/realtime/mysql/iaxfriends.sql
index a83d8ce46..a83d8ce46 100644
--- a/contrib/scripts/iax-friends.sql
+++ b/contrib/realtime/mysql/iaxfriends.sql
diff --git a/contrib/realtime/mysql/meetme.sql b/contrib/realtime/mysql/meetme.sql
new file mode 100644
index 000000000..19c4ed745
--- /dev/null
+++ b/contrib/realtime/mysql/meetme.sql
@@ -0,0 +1,12 @@
+-- 
+-- Table structure for Realtime meetme
+-- 
+
+CREATE TABLE meetme (
+	confno char(80) DEFAULT '0' NOT NULL,
+	pin char(20) NULL,
+	adminpin char(20) NULL,
+	members integer DEFAULT 0 NOT NULL,
+	PRIMARY KEY (confno)
+);
+
diff --git a/contrib/scripts/sip-friends.sql b/contrib/realtime/mysql/sipfriends.sql
index f448b8889..a9c94e8dc 100644
--- a/contrib/scripts/sip-friends.sql
+++ b/contrib/realtime/mysql/sipfriends.sql
@@ -5,7 +5,7 @@
 CREATE TABLE `sipfriends` (
   `name` varchar(40) NOT NULL default '',
   `type` varchar(10) NOT NULL default '',
-  `defaultuser` varchar(40),
+  `username` varchar(40),
   `fromuser` varchar(40),
   `fromdomain` varchar(40),
   `secret` varchar(40),
@@ -49,8 +49,7 @@ CREATE TABLE `sipfriends` (
   `rtpkeepalive` varchar(15),
   `lastms` int(11) NOT NULL default '-1',
   `setvar` varchar(200),
-  `useragent` varchar(50),
   PRIMARY KEY  (`name`),
   INDEX host (host, port),
-  INDEX ipaddr (ipaddr, port)
+  INDEX ipaddr (ipaddr, port),
 ) TYPE=MyISAM;
diff --git a/contrib/scripts/vmdb.sql b/contrib/realtime/mysql/voicemail.sql
index 804d0fc98..c8148cfcb 100644
--- a/contrib/scripts/vmdb.sql
+++ b/contrib/realtime/mysql/voicemail.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS voicemail;
 CREATE TABLE voicemail (
-	-- "uniqueid" is a required column prior to 1.6.2.  As of that version, it may be omitted.
+	-- All of these column names are very specific, including "uniqueid".  Do not change them if you wish voicemail to work.
 	uniqueid INT(5) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 	-- Mailbox context.
 	context CHAR(80) NOT NULL DEFAULT 'default',
@@ -52,8 +52,6 @@ CREATE TABLE voicemail (
 	dialout CHAR(80),
 	-- Context in which to execute 0 or * escape during greeting
 	exitcontext CHAR(80),
-	-- Maximum length of message (in seconds)
-	maxmessage INT(5),
 	-- Maximum messages in a folder (100 if not specified)
 	maxmsg INT(5),
 	-- Increase DB gain on recorded message by this amount (0.0 means none)
diff --git a/contrib/scripts/realtime_pgsql.sql b/contrib/realtime/postgresql/realtime.sql
index d50dff55b..7eab14136 100644
--- a/contrib/scripts/realtime_pgsql.sql
+++ b/contrib/realtime/postgresql/realtime.sql
@@ -25,7 +25,7 @@ billsec bigint DEFAULT 0::bigint NOT NULL,
 disposition character varying(45) DEFAULT '' NOT NULL,
 amaflags bigint DEFAULT 0::bigint NOT NULL,
 accountcode character varying(20) DEFAULT '' NOT NULL,
-uniqueid character varying(150) DEFAULT '' NOT NULL,
+uniqueid character varying(32) DEFAULT '' NOT NULL,
 userfield character varying(255) DEFAULT '' NOT NULL
 );
 
@@ -37,7 +37,7 @@ accountcode character varying(20),
 amaflags character varying(7),
 callgroup character varying(10),
 callerid character varying(80),
-directmedia character varying(3) DEFAULT 'yes',
+canreinvite character varying(3) DEFAULT 'yes',
 context character varying(80),
 defaultip character varying(15),
 dtmfmode character varying(7),
@@ -119,7 +119,6 @@ memberdelay int8,
 weight int8,
 timeoutrestart bool,
 setinterfacevar bool,
-autopause varchar(128),
 PRIMARY KEY (name)
 ) WITHOUT OIDS;
 ALTER TABLE queue_table OWNER TO asterisk;
@@ -127,11 +126,9 @@ ALTER TABLE queue_table OWNER TO asterisk;
 drop table queue_member_table;
 CREATE TABLE queue_member_table
 (
-uniqueid serial,
 queue_name varchar(128),
 interface varchar(128),
 penalty int8,
-paused int8,
 PRIMARY KEY (queue_name, interface)
 ) WITHOUT OIDS;
 
diff --git a/contrib/scripts/meetme.sql b/contrib/scripts/meetme.sql
deleted file mode 100644
index cb96e630c..000000000
--- a/contrib/scripts/meetme.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- 
--- Table structure for Realtime meetme
--- 
-
-CREATE TABLE meetme (
-	confno char(80) DEFAULT '0' NOT NULL,
-	-- Web booking id for the conference
-	bookId char(50) NULL,
-	-- Must set schedule=yes in meetme.conf to use starttime and endtime
-	starttime datetime NULL,
-	endtime datetime NULL,
-	-- PIN to enter the conference, if any
-	pin char(30) NULL,
-	-- Options to associate with normal users of the conference
-	opts char(100) NULL,
-	-- PIN to enter the conference as an administrator, if any
-	adminpin char(30) NULL,
-	-- Options to associate with administrator users of the conference
-	adminopts char(100) NULL,
-	-- Current count of conference participants
-	members integer DEFAULT 0 NOT NULL,
-	-- Maximum conference participants allowed concurrently
-	maxusers integer DEFAULT 0 NOT NULL,
-	-- Recording of the conference, if any
-	recordingfilename char(255) NULL,
-	-- File format of the conference recording, if any
-	recordingformat char(10) NULL,
-	PRIMARY KEY (confno, starttime)
-);
-