Changeset 10980 for freepbx/trunk

Timestamp:

01/16/11 16:37:01 (2 years ago)

Author:

p_lindheimer

Message:

adds freepbx_settings to newinstall sql schema re #4740

Files:

• freepbx/trunk/SQL/newinstall.sql (modified) (1 diff)
• freepbx/trunk/SQL/newinstall.sqlite3.sql (modified) (1 diff)
• freepbx/trunk/upgrades/2.9.0alpha1/migrate_ampconf.php (modified) (1 diff)

freepbx/trunk/SQL/newinstall.sql

@@ -13 +13 @@
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `freepbx_settings`
+--
+
+DROP TABLE IF EXISTS `freepbx_settings`;
+CREATE TABLE `freepbx_settings` (
+  `keyword` varchar(50) default NULL,
+  `value` varchar(255) default NULL,
+  `level` tinyint(1) default 0,
+  `description` text default NULL,
+  `type` varchar(25) default NULL,
+  `options` text default NULL,
+  `defaultval` varchar(255) default NULL,
+  `readonly` tinyint(1) default 0,
+  `hidden` tinyint(1) default 0,
+  `category` varchar(25) default NULL,
+  `module` varchar(25) default NULL,
+  `emptyok` tinyint(1) default 1,
+  PRIMARY KEY  (`keyword`)
+ );
-
---

freepbx/trunk/SQL/newinstall.sqlite3.sql

@@ -1 +1 @@
-BEGIN TRANSACTION;
+
+DROP TABLE IF EXISTS `freepbx_settings`;
+CREATE TABLE `freepbx_settings` (
+  `keyword` varchar(50) default NULL,
+  `value` varchar(255) default NULL,
+  `level` tinyint(1) default 0,
+  `description` text default NULL,
+  `type` varchar(25) default NULL,
+  `options` text default NULL,
+  `defaultval` varchar(255) default NULL,
+  `readonly` tinyint(1) default 0,
+  `hidden` tinyint(1) default 0,
+  `category` varchar(25) default NULL,
+  `module` varchar(25) default NULL,
+  `emptyok` tinyint(1) default 1,
+  PRIMARY KEY  (`keyword`)
+ );
-CREATE TABLE `admin` (
-  `variable` varchar(20) NOT NULL default '',

freepbx/trunk/upgrades/2.9.0alpha1/migrate_ampconf.php

@@ -15 +15 @@
-global $db, $amp_conf;
-
-// TODO: add table to newinstall.sql
-//
-outn(_("Checking for freepbx_settings table.."));
-$sql = 'SELECT count(*) FROM freepbx_settings';