diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-04-26 14:20:16 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-04-26 14:20:16 +0200 |
| commit | d1c84ad9f0884bb49c7840ac59f5756b16cb7aef (patch) | |
| tree | 159d3ea820598e16712519ffc6274615b778108b /install | |
| parent | c904bd3a628e4bf3c2420ee314277da69828c3b2 (diff) | |
| parent | c39a6800968f7ac017d215306b55d5b6bb39ded6 (diff) | |
| download | volse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.tar.gz volse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.tar.bz2 volse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'install')
| -rw-r--r-- | install/schema_mysql.sql | 2 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 2 | ||||
| -rw-r--r-- | install/update.php | 13 |
3 files changed, 16 insertions, 1 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index e075006e1..b64c1ae61 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -763,6 +763,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( `to_xchan` char(255) NOT NULL DEFAULT '', `account_id` int(10) unsigned NOT NULL DEFAULT '0', `channel_id` int(10) unsigned NOT NULL DEFAULT '0', + `mail_mimetype` char(64) NOT NULL DEFAULT 'text/bbcode', `title` text NOT NULL, `body` mediumtext NOT NULL, `sig` text NOT NULL, @@ -775,6 +776,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( `mail_seen` tinyint(4) NOT NULL DEFAULT '0', `mail_recalled` tinyint(4) NOT NULL DEFAULT '0', `mail_obscured` smallint(6) NOT NULL DEFAULT '0', + `mail_raw` tinyint(4) NOT NULL DEFAULT '0', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', `expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', PRIMARY KEY (`id`), diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index be72a85e1..0328040f4 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -751,6 +751,7 @@ CREATE TABLE "mail" ( "to_xchan" text NOT NULL DEFAULT '', "account_id" bigint NOT NULL DEFAULT '0', "channel_id" bigint NOT NULL DEFAULT '0', + "mail_mimetype char(64) NOT NULL DEFAULT '0', "title" text NOT NULL, "body" text NOT NULL, "sig" text NOT NULL, @@ -763,6 +764,7 @@ CREATE TABLE "mail" ( "mail_seen" smallint NOT NULL DEFAULT '0', "mail_recalled" smallint NOT NULL DEFAULT '0', "mail_obscured" smallint NOT NULL DEFAULT '0', + "mail_raw" smallint NOT NULL DEFAULT '0', "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', "expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', PRIMARY KEY ("id") diff --git a/install/update.php b/install/update.php index b37af9cef..84f1a799c 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1189 ); +define( 'UPDATE_VERSION' , 1190 ); /** * @@ -2521,3 +2521,14 @@ function update_r1188() { } +function update_r1189() { + + $r1 = q("alter table mail add mail_mimetype char(64) not null default 'text/bbcode' "); + $r2 = q("alter table mail add mail_raw int(4) not null default '0' "); + + if($r1 && $r2) + return UPDATE_SUCCESS; + return UPDATE_FAILED; + +} + |