[Pkg-voip-commits] r5614 - /freepbx-modules/trunk/debian/patches/sqlite_autoincrement
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Thu Apr 24 21:30:13 UTC 2008
Author: tzafrir-guest
Date: Thu Apr 24 21:30:13 2008
New Revision: 5614
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5614
Log:
Some more sqlite3 fixes.
Modified:
freepbx-modules/trunk/debian/patches/sqlite_autoincrement
Modified: freepbx-modules/trunk/debian/patches/sqlite_autoincrement
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/sqlite_autoincrement?rev=5614&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/patches/sqlite_autoincrement (original)
+++ freepbx-modules/trunk/debian/patches/sqlite_autoincrement Thu Apr 24 21:30:13 2008
@@ -2,13 +2,29 @@
And on a PRIMARY KEY (part of its definition).
--- freepbx-modules-2.3.1.orig/modules/backup/install.php
+++ freepbx-modules-2.3.1/modules/backup/install.php
-@@ -20,8 +20,7 @@ CREATE TABLE IF NOT EXISTS Backup (
+@@ -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(11) NOT NULL PRIMARY KEY $autoincrement
++ ID $int NOT NULL PRIMARY KEY $autoincrement
);";
$check = $db->query($sql);
@@ -19,28 +35,42 @@
-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 INT NOT NULL '.$autoincrement.' PRIMARY KEY,
++ ivr_id INTEGER NOT NULL PRIMARY KEY '.$autoincrement.',
+ displayname VARCHAR(50),
+ deptname VARCHAR(50),
+ enable_directory VARCHAR(8),
+ enable_directdial VARCHAR(8),
-+ timeout INT,
++ 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)) {
+ if (version_compare($ivr_modcurrentvers, "2.2", "<")) {
+ //echo "<p>Start 2.2 upgrade</p>";
+ $sql = "ALTER TABLE ivr CHANGE COLUMN announcement announcement VARCHAR ( 255 )";
++ # if sqlite3: do nothing:
++ if ($amp_conf["AMPDBENGINE"] == "sqlite3") {
++ $sql = "SELECT 1";
++ }
+ $result = $db->query($sql);
+ if(DB::IsError($result)) {
+ die_freepbx($result->getDebugInfo());
--- freepbx-modules-2.3.1.orig/modules/recordings/install.php
+++ freepbx-modules-2.3.1/modules/recordings/install.php
-@@ -22,7 +22,13 @@ $fcc->update();
+@@ -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 = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) ? "AUTOINCREMENT":"AUTO_INCREMENT";
++$autoincrement = $is_sqlite ? "AUTOINCREMENT":"AUTO_INCREMENT";
+$sql = "CREATE TABLE IF NOT EXISTS recordings (
-+ id INT NOT NULL $autoincrement PRIMARY KEY,
++ id INTEGER NOT NULL PRIMARY KEY $autoincrement,
+ displayname VARCHAR(50) ,
+ filename BLOB, description
+ VARCHAR(254)
@@ -48,3 +78,74 @@
$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.3.1.orig/modules/disa/install.php
++++ freepbx-modules-2.3.1/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.3.1.orig/modules/disa/install.sql
++++ /dev/null
+@@ -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.3.1.orig/modules/findmefollow/install.php
++++ freepbx-modules-2.3.1/modules/findmefollow/install.php
+@@ -2,6 +2,10 @@
+
+ global $db;
+
++
++CREATE TABLE IF NOT EXISTS `findmefollow` ( `grpnum` VARCHAR( 20 ) NOT NULL , `strategy` VARCHAR( 50 ) NOT NULL , `grptime` SMALLINT NOT NULL , `grppre` VARCHAR( 100 ) NULL , `grplist` VARCHAR( 255 ) NOT NULL , `annmsg` VARCHAR( 255 ) NULL , `postdest` VARCHAR( 255 ) NULL , `dring` VARCHAR ( 255 ) NULL , remotealert VARCHAR ( 80 ), needsconf VARCHAR ( 10 ), toolate VARCHAR ( 80 ), pre_ring SMALLINT NOT NULL DEFAULT 0, PRIMARY KEY (`grpnum`) ) TYPE = MYISAM ;
++
++
+ // Adding support for a pre_ring before follow-me group
+ $sql = "SELECT pre_ring FROM findmefollow";
+ $check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+--- freepbx-modules-2.3.1.orig/modules/ivr/install.sql
++++ /dev/null
+@@ -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);
More information about the Pkg-voip-commits
mailing list