harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2017-04-26 20:11:12 -07:00
parent 6fcfab3488 1c304eb8ba
commit 88149f56bb
12 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/schema_mysql.sql
View File

@@ -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`),

2
install/schema_postgres.sql
View File

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

13
install/update.php
View File

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