Merge pull request #3 from redmatrix/master

updating from original codebase

3 files changed, 16 insertions, 1 deletions

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 3bb3b7133..a21e5f48a 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -359,11 +359,13 @@ CREATE TABLE IF NOT EXISTS `dreport` (
   `dreport_result` char(255) NOT NULL DEFAULT '',
   `dreport_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `dreport_xchan` char(255) NOT NULL DEFAULT '',
+  `dreport_queue` char(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`dreport_id`),
   KEY `dreport_mid` (`dreport_mid`),
   KEY `dreport_site` (`dreport_site`),
   KEY `dreport_time` (`dreport_time`),
   KEY `dreport_xchan` (`dreport_xchan`),
+  KEY `dreport_queue` (`dreport_queue`),
   KEY `dreport_channel` (`dreport_channel`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 1298f3cb3..26d7d79a3 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -350,6 +350,7 @@ CREATE TABLE IF NOT EXISTS "dreport" (
   "dreport_result" char(255) NOT NULL DEFAULT '',
   "dreport_time" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "dreport_xchan" char(255) NOT NULL DEFAULT '',
+  "dreport_queue" char(255) NOT NULL DEFAULT '',
   PRIMARY KEY ("dreport_id")
 );
 
@@ -357,6 +358,7 @@ create index "dreport_mid" on dreport ("dreport_mid");
 create index "dreport_site" on dreport ("dreport_site");
 create index "dreport_time" on dreport ("dreport_time");
 create index "dreport_xchan" on dreport ("dreport_xchan");
+create index "dreport_queue" on dreport ("dreport_queue");
 create index "dreport_channel" on dreport ("dreport_channel");
 
 
diff --git a/install/update.php b/install/update.php
index cf35698df..bef754570 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1153 );
+define( 'UPDATE_VERSION' , 1154 );
 
 /**
  *
@@ -1854,3 +1854,14 @@ function update_r1152() {
     return UPDATE_FAILED;
 
 }
+
+function update_r1153() {
+
+	$r1 = q("ALTER TABLE dreport ADD dreport_queue CHAR( 255 ) NOT NULL DEFAULT '' ");
+	$r2 = q("create index dreport_queue on dreport ( dreport_queue) ");
+    if($r1 && $r2)
+        return UPDATE_SUCCESS;
+    return UPDATE_FAILED;
+
+
+}