diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-26 20:11:12 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-26 20:11:12 -0700 |
| commit | 88149f56bb2d2fb8f4a02cc320e5ba83435d8acc (patch) | |
| tree | 8fd1c67cc364af4dee4ce81cd37befe4a9857e44 /install | |
| parent | 6fcfab34883e5e93e9438ed4872de304e22b0f00 (diff) | |
| parent | 1c304eb8ba5395e62c0245133d58a3f00adaeaac (diff) | |
| download | volse-hubzilla-88149f56bb2d2fb8f4a02cc320e5ba83435d8acc.tar.gz volse-hubzilla-88149f56bb2d2fb8f4a02cc320e5ba83435d8acc.tar.bz2 volse-hubzilla-88149f56bb2d2fb8f4a02cc320e5ba83435d8acc.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
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 19b8efc21..bfeec0801 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -717,6 +717,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( `to_xchan` char(191) 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, @@ -729,6 +730,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 40e320eb7..02cb48d8c 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -710,6 +710,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, @@ -722,6 +723,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 75f9158c9..ce65d1db9 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; + +} + |