aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-16 19:13:29 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-16 19:13:29 -0700
commit6a1d1867f0dccccaf567c689a701e62c7f3a9a6d (patch)
tree34de8cca5a9b1d24681f65310638b5e5f7e0f7b9
parent18bc12c21ceb6f8c4c92aefea41afa2c235500a8 (diff)
parentb3b566c907f3e48d0522fcd75c0a9ee9f988030c (diff)
downloadvolse-hubzilla-6a1d1867f0dccccaf567c689a701e62c7f3a9a6d.tar.gz
volse-hubzilla-6a1d1867f0dccccaf567c689a701e62c7f3a9a6d.tar.bz2
volse-hubzilla-6a1d1867f0dccccaf567c689a701e62c7f3a9a6d.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-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 31ec60a89..514a8e783 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
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 b1d59a0f5..879ba0b88 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -367,6 +367,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`),
@@ -377,7 +381,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;
CREATE TABLE IF NOT EXISTS `fcontact` (
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 7d81f31aa..47ca7a7f7 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -358,6 +358,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");
@@ -370,6 +374,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 e8c4f578e..4f2bebba6 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1145 );
+define( 'UPDATE_VERSION' , 1146 );
/**
*
@@ -1686,4 +1686,27 @@ function update_r1144() {
}
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