diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-08-18 17:15:53 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-18 17:15:53 -0700 |
commit | 3b1554db2eb1a3d1346103832099d0171b978868 (patch) | |
tree | d2c60f6bd5fd78e35bfa2939cfa4cdf43b0655dc /install | |
parent | 27b61b1456cd612d70e299b695cf4d0c99f16222 (diff) | |
parent | 37d07a7d2a3808169b87c5033ef413ce957bf2ef (diff) | |
download | volse-hubzilla-3b1554db2eb1a3d1346103832099d0171b978868.tar.gz volse-hubzilla-3b1554db2eb1a3d1346103832099d0171b978868.tar.bz2 volse-hubzilla-3b1554db2eb1a3d1346103832099d0171b978868.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'install')
-rw-r--r-- | install/schema_mysql.sql | 4 | ||||
-rw-r--r-- | install/schema_postgres.sql | 2 | ||||
-rw-r--r-- | install/update.php | 14 |
3 files changed, 17 insertions, 3 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 879ba0b88..5b7d77a77 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -371,6 +371,7 @@ CREATE TABLE IF NOT EXISTS `event` ( `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, + `event_sequence` smallint(6) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `uid` (`uid`), KEY `type` (`type`), @@ -382,7 +383,8 @@ CREATE TABLE IF NOT EXISTS `event` ( KEY `aid` (`aid`), KEY `event_hash` (`event_hash`), KEY `event_xchan` (`event_xchan`), - KEY `event_status` (`event_status`) + KEY `event_status` (`event_status`), + KEY `event_sequence` (`event_sequence`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `fcontact` ( diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 47ca7a7f7..7ebdeca54 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -362,6 +362,7 @@ CREATE TABLE "event" ( "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, + "event_sequence" smallint NOT NULL DEFAULT '0', PRIMARY KEY ("id") ); create index "event_uid_idx" on event ("uid"); @@ -375,6 +376,7 @@ 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 index "event_sequence_idx" on event ("event_sequence"); CREATE TABLE "fcontact" ( diff --git a/install/update.php b/install/update.php index 4f2bebba6..3ca22c8c5 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1146 ); +define( 'UPDATE_VERSION' , 1147 ); /** * @@ -1709,4 +1709,14 @@ function update_r1145() { return UPDATE_SUCCESS; return UPDATE_FAILED; -}
\ No newline at end of file +} + +function update_r1146() { + + $r1 = q("alter table event add event_sequence smallint not null default '0' "); + $r2 = q("create index event_sequence on event ( event_sequence ) "); + if($r1 && $r2) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + |