aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xboot.php2
-rw-r--r--install/schema_mysql.sql7
-rw-r--r--install/schema_postgres.sql5
-rw-r--r--install/update.php25
-rw-r--r--version.inc2
5 files changed, 37 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index 2eeec1847..22eb940ac 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'redmatrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1145 );
+define ( 'DB_UPDATE_VERSION', 1146 );
/**
* @brief Constant with a HTML line break.
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 4d0da366f..ef52bcbec 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -432,6 +432,10 @@ CREATE TABLE IF NOT EXISTS `event` (
`allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL,
`deny_gid` mediumtext NOT NULL,
+ `event_status` char(255) NOT NULL DEFAULT '',
+ `event_status_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `event_percent` smallint(6) NOT NULL DEFAULT '0',
+ `event_repeat` text NOT NULL,
PRIMARY KEY (`id`),
KEY `uid` (`uid`),
KEY `type` (`type`),
@@ -442,7 +446,8 @@ CREATE TABLE IF NOT EXISTS `event` (
KEY `ignore` (`ignore`),
KEY `aid` (`aid`),
KEY `event_hash` (`event_hash`),
- KEY `event_xchan` (`event_xchan`)
+ KEY `event_xchan` (`event_xchan`),
+ KEY `event_status` (`event_status`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index a58e5a2ae..d7cf81d44 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -332,6 +332,10 @@ CREATE TABLE "event" (
"allow_gid" text NOT NULL,
"deny_cid" text NOT NULL,
"deny_gid" text NOT NULL,
+ "event_status" char(255) NOT NULL DEFAULT '',
+ "event_status_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
+ "event_percent" smallint(6) NOT NULL DEFAULT '0',
+ "event_repeat" text NOT NULL,
PRIMARY KEY ("id")
);
create index "event_uid_idx" on event ("uid");
@@ -344,6 +348,7 @@ create index "event_ignore_idx" on event ("ignore");
create index "event_aid_idx" on event ("aid");
create index "event_hash_idx" on event ("event_hash");
create index "event_xchan_idx" on event ("event_xchan");
+create index "event_status_idx" on event ("event_status");
CREATE TABLE "fcontact" (
diff --git a/install/update.php b/install/update.php
index 0f9ec4c79..c86a29d1a 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1145 );
+define( 'UPDATE_VERSION' , 1146 );
/**
*
@@ -1671,4 +1671,27 @@ function update_r1143() {
function update_r1144() {
// hubzilla update does not apply here, but we're keeping the numbers in sync
return UPDATE_SUCCESS;
+}
+
+function update_r1145() {
+
+ if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+ $r1 = q("ALTER TABLE event ADD event_status char(255) NOT NULL DEFAULT '',
+ ADD event_status_date timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
+ ADD event_percent SMALLINT NOT NULL DEFAULT '0',
+ ADD event_repeat TEXT NOT NULL DEFAULT '' ");
+ $r2 = q("create index event_status on event ( event_status )");
+ $r = $r1 && $r2;
+ }
+ else {
+ $r = q("ALTER TABLE `event` ADD `event_status` CHAR( 255 ) NOT NULL DEFAULT '',
+ ADD `event_status_date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+ ADD `event_percent` SMALLINT NOT NULL DEFAULT '0',
+ ADD `event_repeat` TEXT NOT NULL DEFAULT '',
+ ADD INDEX ( `event_status` ) ");
+ }
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+
} \ No newline at end of file
diff --git a/version.inc b/version.inc
index 70a3aa358..0165778ef 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-08-14.1124
+2015-08-16.1126