aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-20 22:14:51 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-20 22:14:51 -0700
commit43fbbfe0dff1f2a51c0d6911a78bf8a3724dc752 (patch)
treeea0d596c1c970c234d75c30a250a92ce86b66493
parent3e7a76cc6418b8ef589ec9de725821743a156484 (diff)
parent72bdca009c076023342c190c5e3dde6725cd9635 (diff)
downloadvolse-hubzilla-43fbbfe0dff1f2a51c0d6911a78bf8a3724dc752.tar.gz
volse-hubzilla-43fbbfe0dff1f2a51c0d6911a78bf8a3724dc752.tar.bz2
volse-hubzilla-43fbbfe0dff1f2a51c0d6911a78bf8a3724dc752.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rwxr-xr-xboot.php2
-rw-r--r--install/schema_mysql.sql4
-rw-r--r--install/schema_postgres.sql2
-rw-r--r--install/update.php10
-rw-r--r--version.inc2
5 files changed, 16 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index 29f62a346..3577addc6 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', 1147 );
+define ( 'DB_UPDATE_VERSION', 1148 );
/**
* @brief Constant with a HTML line break.
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 5b7d77a77..aaeab4f87 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -372,6 +372,7 @@ CREATE TABLE IF NOT EXISTS `event` (
`event_percent` smallint(6) NOT NULL DEFAULT '0',
`event_repeat` text NOT NULL,
`event_sequence` smallint(6) NOT NULL DEFAULT '0',
+ `event_priority` smallint(6) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `uid` (`uid`),
KEY `type` (`type`),
@@ -384,7 +385,8 @@ CREATE TABLE IF NOT EXISTS `event` (
KEY `event_hash` (`event_hash`),
KEY `event_xchan` (`event_xchan`),
KEY `event_status` (`event_status`),
- KEY `event_sequence` (`event_sequence`)
+ KEY `event_sequence` (`event_sequence`),
+ KEY `event_priority` (`event_priority`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `fcontact` (
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 7ebdeca54..da5a503e7 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -363,6 +363,7 @@ CREATE TABLE "event" (
"event_percent" smallint(6) NOT NULL DEFAULT '0',
"event_repeat" text NOT NULL,
"event_sequence" smallint NOT NULL DEFAULT '0',
+ "event_priority" smallint NOT NULL DEFAULT '0',
PRIMARY KEY ("id")
);
create index "event_uid_idx" on event ("uid");
@@ -377,6 +378,7 @@ 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 index "event_sequence_idx" on event ("event_sequence");
+create index "event_priority_idx" on event ("event_priority");
CREATE TABLE "fcontact" (
diff --git a/install/update.php b/install/update.php
index 3ca22c8c5..9aca14d2e 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1147 );
+define( 'UPDATE_VERSION' , 1148 );
/**
*
@@ -1720,3 +1720,11 @@ function update_r1146() {
return UPDATE_FAILED;
}
+function update_r1147() {
+
+ $r1 = q("alter table event add event_priority smallint not null default '0' ");
+ $r2 = q("create index event_priority on event ( event_priority ) ");
+ if($r1 && $r2)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+}
diff --git a/version.inc b/version.inc
index 807ab4e76..a8c435908 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-08-18.1128
+2015-08-20.1130