[Pkg-voip-commits] r6362 - in /freepbx-modules/trunk: ./ debian/patches/sqlite_autoincrement
odd_bloke-guest at alioth.debian.org
odd_bloke-guest at alioth.debian.org
Wed Oct 29 17:21:48 UTC 2008
Author: odd_bloke-guest
Date: Wed Oct 29 17:21:48 2008
New Revision: 6362
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6362
Log:
Refreshed 'debian/patches/sqlite_autoincrement'.
Modified:
freepbx-modules/trunk/ (props changed)
freepbx-modules/trunk/debian/patches/sqlite_autoincrement
Propchange: freepbx-modules/trunk/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Wed Oct 29 17:21:48 2008
@@ -1,1 +1,1 @@
-debian/patches/fix_dashboard_warning 5627 at 5e74be4b-f5d6-0310-a852-e9e23c5afa6a:freepbx-modules%2Ftrunk:debian%2Fpatches%2Ffix_dashboard_warning
+debian/patches/sqlite_autoincrement 5543 at 5e74be4b-f5d6-0310-a852-e9e23c5afa6a:freepbx-modules%2Ftrunk:debian%2Fpatches%2Fsqlite_autoincrement
Propchange: freepbx-modules/trunk/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-trunk1 (original)
+++ bzr:revision-id:v3-trunk1 Wed Oct 29 17:21:48 2008
@@ -12,3 +12,4 @@
42 daniel at daniel-watkins.co.uk-20081029163531-kjc0m0zbw0q148wd
43 daniel at daniel-watkins.co.uk-20081029165027-wczvib48qm8h0z33
44 daniel at daniel-watkins.co.uk-20081029165210-8jwgdoa7kqketroe
+45 daniel at daniel-watkins.co.uk-20081029171545-kx4rronisugkogcq
Propchange: freepbx-modules/trunk/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Wed Oct 29 17:21:48 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-10-29 16:52:10.680999994 +0000
+timestamp: 2008-10-29 17:15:45.381999969 +0000
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
properties:
branch-nick: freepbx-modules
Modified: freepbx-modules/trunk/debian/patches/sqlite_autoincrement
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/sqlite_autoincrement?rev=6362&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/patches/sqlite_autoincrement (original)
+++ freepbx-modules/trunk/debian/patches/sqlite_autoincrement Wed Oct 29 17:21:48 2008
@@ -1,53 +1,21 @@
sqlite allows AUTO_INCREMENT. But only if it is called AUTOINCREMENT.
And on a PRIMARY KEY (part of its definition).
---- freepbx-modules-2.4.0.orig/modules/backup/install.php
-+++ freepbx-modules-2.4.0/modules/backup/install.php
-@@ -3,7 +3,14 @@
- global $db;
- global $amp_conf;
-
--$autoincrement = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) ? "AUTOINCREMENT":"AUTO_INCREMENT";
-+$autoincrement = "AUTO_INCREMENT";
-+$int = "int(11)";
-+
-+if (($amp_conf["AMPDBENGINE"] == "sqlite") ||
-+ ($amp_conf["AMPDBENGINE"] == "sqlite3")) {
-+ $autoincrement = "AUTOINCREMENT";
-+ $int = "INTEGER";
-+}
-
- $sql = "
- CREATE TABLE IF NOT EXISTS Backup (
-@@ -20,8 +27,7 @@ CREATE TABLE IF NOT EXISTS Backup (
- Weekdays varchar(50) default NULL,
- Command varchar(200) default NULL,
- Method varchar(50) default NULL,
-- ID int(11) NOT NULL $autoincrement,
-- PRIMARY KEY (ID)
-+ ID $int NOT NULL PRIMARY KEY $autoincrement
- );";
-
- $check = $db->query($sql);
---- freepbx-modules-2.4.0.orig/modules/ivr/install.php
-+++ freepbx-modules-2.4.0/modules/ivr/install.php
-@@ -1,5 +1,15 @@
- <?php
--sql('CREATE TABLE IF NOT EXISTS ivr ( ivr_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, displayname VARCHAR(50), deptname VARCHAR(50), enable_directory VARCHAR(8), enable_directdial VARCHAR(8), timeout INT, announcement VARCHAR(255), dircontext VARCHAR ( 50 ) DEFAULT "default" )');
-+$autoincrement = ($amp_conf["AMPDBENGINE"] == "sqlite3") ? "AUTOINCREMENT":"AUTO_INCREMENT";
-+sql('CREATE TABLE IF NOT EXISTS ivr (
-+ ivr_id INTEGER NOT NULL PRIMARY KEY '.$autoincrement.',
-+ displayname VARCHAR(50),
-+ deptname VARCHAR(50),
-+ enable_directory VARCHAR(8),
-+ enable_directdial VARCHAR(8),
-+ timeout INTEGER,
-+ announcement VARCHAR(255),
-+ dircontext VARCHAR ( 50 ) DEFAULT "default"
-+)');
- sql('CREATE TABLE IF NOT EXISTS ivr_dests ( ivr_id INT NOT NULL, selection VARCHAR(10), dest VARCHAR(50))');
-
- global $db;
-@@ -28,6 +38,10 @@ if(DB::IsError($check)) {
+Index: freepbx-modules/modules/ivr/install.php
+===================================================================
+--- freepbx-modules.orig/modules/ivr/install.php 2008-10-29 17:00:36.000000000 +0000
++++ freepbx-modules/modules/ivr/install.php 2008-10-29 17:03:37.000000000 +0000
+@@ -79,6 +79,10 @@
+ if(DB::IsError($check)) {
+ // add new field
+ $sql = 'ALTER TABLE ivr ADD COLUMN dircontext VARCHAR ( 50 ) DEFAULT "default"';
++ # if sqlite3: do nothing:
++ if ($amp_conf["AMPDBENGINE"] == "sqlite3") {
++ $sql = "SELECT 1";
++ }
+ $result = $db->query($sql);
+ if(DB::IsError($result)) {
+ die_freepbx($result->getDebugInfo());
+@@ -88,6 +92,10 @@
if (version_compare($ivr_modcurrentvers, "2.2", "<")) {
//echo "<p>Start 2.2 upgrade</p>";
$sql = "ALTER TABLE ivr CHANGE COLUMN announcement announcement VARCHAR ( 255 )";
@@ -58,172 +26,37 @@
$result = $db->query($sql);
if(DB::IsError($result)) {
die_freepbx($result->getDebugInfo());
---- freepbx-modules-2.4.0.orig/modules/recordings/install.php
-+++ freepbx-modules-2.4.0/modules/recordings/install.php
-@@ -21,8 +21,16 @@ $fcc->setDefault('*99');
- $fcc->update();
- unset($fcc);
-
-+$is_sqlite = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3"));
-+
- // Make sure table exists
--$sql = "CREATE TABLE IF NOT EXISTS recordings ( id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, displayname VARCHAR(50) , filename BLOB, description VARCHAR(254));";
-+$autoincrement = $is_sqlite ? "AUTOINCREMENT":"AUTO_INCREMENT";
-+$sql = "CREATE TABLE IF NOT EXISTS recordings (
-+ id INTEGER NOT NULL PRIMARY KEY $autoincrement,
-+ displayname VARCHAR(50) ,
-+ filename BLOB, description
-+ VARCHAR(254)
-+);";
- $result = $db->query($sql);
- if(DB::IsError($result)) {
- die_freepbx($result->getDebugInfo());
-@@ -42,7 +50,7 @@ if (!is_writable($recordings_directory))
- $sql = "SELECT * FROM recordings where displayname = '__invalid'";
- $results = $db->getRow($sql, DB_FETCHMODE_ASSOC);
- if (!isset($results['filename'])) {
-- sql("INSERT INTO recordings values ('', '__invalid', 'install done', '')");
-+ sql("INSERT INTO recordings values (NULL, '__invalid', 'install done', '')");
- $dh = opendir($recordings_directory);
- while (false !== ($file = readdir($dh))) { // http://au3.php.net/readdir
- if ($file[0] != "." && $file != "CVS" && $file != "svn" && !is_dir("$recordings_directory/$file")) {
-@@ -60,6 +68,9 @@ global $db;
- // Upgrade to recordings 3.0
- // Change filename from VARCHAR(80) to BLOB
- $sql = 'ALTER TABLE recordings CHANGE filename filename BLOB';
-+if ($is_sqlite) {
-+ $sql = "SELECT 1"; // Do nothing
-+}
- $result = $db->query($sql);
- if(DB::IsError($result)) {
- die_freepbx($result->getDebugInfo());
---- freepbx-modules-2.4.0.orig/modules/disa/install.php
-+++ freepbx-modules-2.4.0/modules/disa/install.php
-@@ -2,6 +2,27 @@
-
- global $db;
-
-+$autoincrement = "AUTO_INCREMENT";
-+$db_engine = $amp_conf["AMPDBENGINE"];
-+if (($db_engine == "sqlite") || ($db_engine == "sqlite3")) {
-+ $autoincrement = "AUTOINCREMENT";
-+}
-+$sql = "
-+CREATE TABLE IF NOT EXISTS disa (
-+ disa_id INTEGER NOT NULL PRIMARY KEY $autoincrement,
-+ displayname VARCHAR( 50 ),
-+ pin VARCHAR ( 50 ),
-+ cid VARCHAR ( 50 ),
-+ context VARCHAR ( 50 ),
-+ digittimeout INT,
-+ resptimeout INT,
-+ needconf VARCHAR( 10 )
-+);";
-+$result = $db->query($sql);
-+if(DB::IsError($result)) {
-+ die_freepbx($result->getDebugInfo());
-+}
-+
- // Manage upgrade from DISA 1.0
- // r2.0 Add Timeouts and add wait for confirmation
- $sql = "SELECT digittimeout FROM disa";
---- freepbx-modules-2.4.0.orig/modules/disa/install.sql
-+++ /dev/null
+Index: freepbx-modules/modules/disa/install.sql
+===================================================================
+--- freepbx-modules.orig/modules/disa/install.sql 2008-10-29 17:00:37.000000000 +0000
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-CREATE TABLE IF NOT EXISTS disa ( disa_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY , displayname VARCHAR( 50 ), pin VARCHAR ( 50 ), cid VARCHAR ( 50 ), context VARCHAR ( 50 ), digittimeout INT, resptimeout INT, needconf VARCHAR( 10 ) );
---- freepbx-modules-2.4.0.orig/modules/ivr/install.sql
-+++ /dev/null
+Index: freepbx-modules/modules/ivr/install.sql
+===================================================================
+--- freepbx-modules.orig/modules/ivr/install.sql 2008-10-29 17:00:36.000000000 +0000
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-CREATE TABLE IF NOT EXISTS ivr ( ivr_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, displayname VARCHAR(50), deptname VARCHAR(50), enable_directory VARCHAR(8), enable_directdial VARCHAR(8), timeout INT, announcement VARCHAR(255), dircontext VARCHAR ( 50 ) DEFAULT "default" );
-CREATE TABLE IF NOT EXISTS ivr_dests ( ivr_id INT NOT NULL, selection VARCHAR(10), dest VARCHAR(50), ivr_ret TINYINT(1) NOT NULL DEFAULT 0);
---- /dev/null
-+++ freepbx-modules-2.4.0/modules/customerdb/install.php
-@@ -0,0 +1,31 @@
-+<?php
-+
-+global $db;
-+global $amp_conf;
-+
-+$autoincrement = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) ? "AUTOINCREMENT":"AUTO_INCREMENT";
-+$sql = "
-+CREATE TABLE IF NOT EXISTS customerdb (
-+ id INTEGER PRIMARY KEY $autoincrement,
-+ name varchar(45) NOT NULL,
-+ addr1 varchar(150) NOT NULL,
-+ addr2 varchar(150) NULL,
-+ city varchar(50) NOT NULL,
-+ state varchar(5) NOT NULL,
-+ zip varchar(12) NULL,
-+ sip varchar(20) NULL,
-+ did varchar(45) NULL,
-+ device varchar(50) NULL,
-+ ip varchar(20) NULL,
-+ serial varchar(50) NULL,
-+ account varchar(6) NULL,
-+ email varchar(150) NULL,
-+ username varchar(25) NULL,
-+ password varchar(25) NULL
-+);";
-+$check = $db->query($sql);
-+if(DB::IsError($check)) {
-+ die_freepbx("Can not create customerdb table: $sql");
-+}
-+
-+?>
---- freepbx-modules-2.4.0.orig/modules/customerdb/install.sql
-+++ /dev/null
+Index: freepbx-modules/modules/customerdb/install.sql
+===================================================================
+--- freepbx-modules.orig/modules/customerdb/install.sql 2008-10-29 17:00:36.000000000 +0000
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-CREATE TABLE IF NOT EXISTS customerdb (id int UNIQUE AUTO_INCREMENT, name varchar(45) not null, addr1 varchar(150) not null, addr2 varchar(150) null, city varchar(50) not null, state varchar(5) not null, zip varchar(12) null, sip varchar(20) null, did varchar(45) null, device varchar(50) null, ip varchar(20) null, serial varchar(50) null, account varchar(6) null, email varchar(150) null, username varchar(25) null, password varchar(25) null);
---- /dev/null
-+++ freepbx-modules-2.4.0/modules/phpagiconf/install.php
-@@ -0,0 +1,39 @@
-+<?php
-+
-+global $db;
-+global $amp_conf;
-+
-+$autoincrement = "AUTO_INCREMENT";
-+$bool = 'BOOL';
-+$type_str = " TYPE = MYISAM";
-+
-+if (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) {
-+ $autoincrement = "AUTOINCREMENT";
-+ $bool = "INTEGER";
-+ $type_str = '';
-+}
-+$sql = "
-+CREATE TABLE IF NOT EXISTS `phpagiconf` (
-+ `phpagiid` INTEGER NOT NULL PRIMARY KEY $autoincrement,
-+ `debug` $bool,
-+ `error_handler` $bool,
-+ `err_email` VARCHAR( 50 ),
-+ `hostname` VARCHAR( 255 ),
-+ `tempdir` VARCHAR( 255 ),
-+ `festival_text2wave` VARCHAR( 255 ),
-+ `asman_server` VARCHAR( 255 ),
-+ `asman_port` INT NOT NULL,
-+ `asman_user` VARCHAR( 50 ),
-+ `asman_secret` VARCHAR( 255 ),
-+ `cepstral_swift` VARCHAR( 255 ),
-+ `cepstral_voice` VARCHAR( 50 ),
-+ `setuid` $bool,
-+ `basedir` VARCHAR( 255 )
-+) $type_str;";
-+
-+$check = $db->query($sql);
-+if(DB::IsError($check)) {
-+ die_freepbx("Can not create phpagiconf table: $sql");
-+}
-+
-+?>
---- freepbx-modules-2.4.0.orig/modules/phpagiconf/install.sql
-+++ /dev/null
+Index: freepbx-modules/modules/phpagiconf/install.sql
+===================================================================
+--- freepbx-modules.orig/modules/phpagiconf/install.sql 2008-10-29 17:00:36.000000000 +0000
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-CREATE TABLE IF NOT EXISTS `phpagiconf` ( `phpagiid` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , `debug` BOOL , `error_handler` BOOL , `err_email` VARCHAR( 50 ) , `hostname` VARCHAR( 255 ) , `tempdir` VARCHAR( 255 ) , `festival_text2wave` VARCHAR( 255 ) , `asman_server` VARCHAR( 255 ) , `asman_port` INT NOT NULL , `asman_user` VARCHAR( 50 ) , `asman_secret` VARCHAR( 255 ) , `cepstral_swift` VARCHAR( 255 ) , `cepstral_voice` VARCHAR( 50 ) , `setuid` BOOL , `basedir` VARCHAR( 255 ) ) TYPE = MYISAM ;
-
---- freepbx-modules-2.4.0.orig/modules/cidlookup/install.php
-+++ freepbx-modules-2.4.0/modules/cidlookup/install.php
-@@ -15,7 +15,14 @@ if (! function_exists("outn")) {
+Index: freepbx-modules/modules/cidlookup/install.php
+===================================================================
+--- freepbx-modules.orig/modules/cidlookup/install.php 2008-10-29 17:00:37.000000000 +0000
++++ freepbx-modules/modules/cidlookup/install.php 2008-10-29 17:01:00.000000000 +0000
+@@ -15,7 +15,14 @@
}
}
@@ -239,40 +72,3 @@
// create the tables
$sql = "CREATE TABLE IF NOT EXISTS cidlookup (
---- freepbx-modules-2.4.0.orig/modules/ringgroups/install.php
-+++ freepbx-modules-2.4.0/modules/ringgroups/install.php
-@@ -15,20 +15,21 @@ if(DB::IsError($check)) {
- die_freepbx($result->getDebugInfo());
- }
-
-- // update existing groups
-- $sql = "UPDATE ringgroups SET description = CONCAT('Ring Group ', grpnum) WHERE description IS NULL ;";
-- $result = $db->query($sql);
-- if(DB::IsError($result)) {
-- die_freepbx($result->getDebugInfo());
-- }
--
- if ( ($db_engine != 'sqlite') && ($db_engine != 'sqlite3' ) ) {
-- // make new field required
-- $sql = "ALTER TABLE `ringgroups` CHANGE `description` `description` VARCHAR( 35 ) NOT NULL ;";
-- $result = $db->query($sql);
-- if(DB::IsError($result)) {
-- die_freepbx($result->getDebugInfo());
-- }
-+ // FIXME: define an sqlite function CONCAT so this can work.
-+ // update existing groups
-+ $sql = "UPDATE ringgroups SET description = CONCAT('Ring Group ', grpnum) WHERE description IS NULL ;";
-+ $result = $db->query($sql);
-+ if(DB::IsError($result)) {
-+ die_freepbx($result->getDebugInfo());
-+ }
-+
-+ // make new field required
-+ $sql = "ALTER TABLE `ringgroups` CHANGE `description` `description` VARCHAR( 35 ) NOT NULL ;";
-+ $result = $db->query($sql);
-+ if(DB::IsError($result)) {
-+ die_freepbx($result->getDebugInfo());
-+ }
- }
- }
- // Version 1.2 upgrade
More information about the Pkg-voip-commits
mailing list