aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-24 23:32:18 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-24 23:32:18 +0200
commit414b5ea6f3ad616c5211b0e9d4b811c149decf26 (patch)
tree58d7a19079cc1c7de0790b0e2f3b829967344ea1 /install
parent8cbccb20ef7f1fa82c4a16c6c786d5d748901c02 (diff)
parentc42dcd5ac9c63cd42c7af1b2765dd33e7e9f5d6d (diff)
downloadvolse-hubzilla-414b5ea6f3ad616c5211b0e9d4b811c149decf26.tar.gz
volse-hubzilla-414b5ea6f3ad616c5211b0e9d4b811c149decf26.tar.bz2
volse-hubzilla-414b5ea6f3ad616c5211b0e9d4b811c149decf26.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'install')
-rw-r--r--install/schema_mysql.sql1
-rw-r--r--install/schema_postgres.sql1
-rw-r--r--install/update.php12
3 files changed, 13 insertions, 1 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index a21e5f48a..c78259e41 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -396,6 +396,7 @@ CREATE TABLE IF NOT EXISTS `event` (
`event_repeat` text NOT NULL,
`event_sequence` smallint(6) NOT NULL DEFAULT '0',
`event_priority` smallint(6) NOT NULL DEFAULT '0',
+ `event_vdata` text NOT NULL,
PRIMARY KEY (`id`),
KEY `uid` (`uid`),
KEY `type` (`type`),
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 26d7d79a3..6145e9ccb 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -392,6 +392,7 @@ CREATE TABLE "event" (
"event_repeat" text NOT NULL,
"event_sequence" smallint NOT NULL DEFAULT '0',
"event_priority" smallint NOT NULL DEFAULT '0',
+ "event_vdata" text NOT NULL,
PRIMARY KEY ("id")
);
create index "event_uid_idx" on event ("uid");
diff --git a/install/update.php b/install/update.php
index bef754570..9f4457600 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1154 );
+define( 'UPDATE_VERSION' , 1155 );
/**
*
@@ -1865,3 +1865,13 @@ function update_r1153() {
}
+
+function update_r1154() {
+
+ $r = q("ALTER TABLE event ADD event_vdata text NOT NULL ");
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+
+}
+