schema updates for iconfig

4 files changed, 63 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index 1471aa781..b5b4aad4a 100755
--- a/boot.php
+++ b/boot.php
@@ -51,7 +51,7 @@ define ( 'RED_VERSION',             trim(file_get_contents('version.inc')));
 define ( 'STD_VERSION',             '1.2.2' );
 define ( 'ZOT_REVISION',            1     );
 
-define ( 'DB_UPDATE_VERSION',       1161  );
+define ( 'DB_UPDATE_VERSION',       1162  );
 
 
 /**
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 3d7ea41df..bb6ad24a2 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -543,6 +543,19 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
   KEY `hubloc_error` (`hubloc_error`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+
+CREATE TABLE IF NOT EXISTS `iconfig` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `iid` int(11) NOT NULL DEFAULT '0',
+  `cat` char(255) NOT NULL DEFAULT '',
+  `k` char(255) NOT NULL DEFAULT '',
+  `v` mediumtext NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `iid` (`iid`),
+  KEY `cat` (`cat`),
+  KEY `k` (`k`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
 CREATE TABLE IF NOT EXISTS `issue` (
   `issue_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `issue_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 5cabbc2c9..2d9bffdec 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -538,6 +538,17 @@ create index "hubloc_primary" on hubloc ("hubloc_primary");
 create index "hubloc_orphancheck" on hubloc ("hubloc_orphancheck");
 create index "hubloc_error" on hubloc ("hubloc_error");
 create index "hubloc_deleted" on hubloc ("hubloc_deleted");
+CREATE TABLE "iconfig" (
+  "id" serial NOT NULL,
+  "iid" bigint NOT NULL DEFAULT '0',
+  "cat" text NOT NULL DEFAULT '',
+  "k" text NOT NULL DEFAULT '',
+  "v" text NOT NULL DEFAULT '',
+  PRIMARY_KEY("id")
+);
+create index "iconfig_iid" on iconfig ("iid");
+create index "iconfig_cat" on iconfig ("cat");
+create index "iconfig_k" on iconfig ("k");
 CREATE TABLE "issue" (
   "issue_id" serial  NOT NULL,
   "issue_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
diff --git a/install/update.php b/install/update.php
index 24f4f21d5..e96bda03c 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1161 );
+define( 'UPDATE_VERSION' , 1162 );
 
 /**
  *
@@ -1957,3 +1957,40 @@ function update_r1160() {
     return UPDATE_FAILED;
 }
 
+function update_r1161() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { 
+		$r1 = q("CREATE TABLE \"iconfig\" (
+  \"id\" serial NOT NULL,
+  \"iid\" bigint NOT NULL DEFAULT '0',
+  \"cat\" text NOT NULL DEFAULT '',
+  \"k\" text NOT NULL DEFAULT '',
+  \"v\" text NOT NULL DEFAULT '',
+  PRIMARY_KEY(\"id\")
+) ");
+$r2 = q("create index \"iconfig_iid\" on iconfig (\"iid\") ");;
+$r3 = q("create index \"iconfig_cat\" on iconfig (\"cat\") ");
+$r4 = q("create index \"iconfig_k\" on iconfig (\"k\") ");
+
+	$r = $r1 && $r2 && $r3 && $r4;
+	}
+	else {
+		$r = q("CREATE TABLE IF NOT EXISTS `iconfig` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `iid` int(11) NOT NULL DEFAULT '0',
+  `cat` char(255) NOT NULL DEFAULT '',
+  `k` char(255) NOT NULL DEFAULT '',
+  `v` mediumtext NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `iid` (`iid`),
+  KEY `cat` (`cat`),
+  KEY `k` (`k`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ");
+
+	}
+
+    if($r)
+        return UPDATE_SUCCESS;
+    return UPDATE_FAILED;
+}
+