Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 23:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse source
This commit is contained in:
redmatrix 2015-08-16 19:13:29 -07:00
commit 6a1d1867f0
5 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -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.

7
install/schema_mysql.sql
View file

@ -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` (

5
install/schema_postgres.sql
View file

@ -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" (

25
install/update.php
View file

@ -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;
}

2
version.inc
View file

@ -1 +1 @@
2015-08-14.1124
2015-08-16.1126