aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-30 18:18:28 -0700
committerzotlabs <mike@macgirvin.com>2017-05-30 18:18:28 -0700
commitd3cad5a651d32557d92457b347c0d67372d2482c (patch)
tree733ade8a68e6d39769468b1caaaa4a7282d9e6a5 /install
parent893ae17b99d1a1a720a58879e8075fc9bb1de087 (diff)
parent14229d0dd3205ea1e85d2c26d6c79bd68d19eda3 (diff)
downloadvolse-hubzilla-d3cad5a651d32557d92457b347c0d67372d2482c.tar.gz
volse-hubzilla-d3cad5a651d32557d92457b347c0d67372d2482c.tar.bz2
volse-hubzilla-d3cad5a651d32557d92457b347c0d67372d2482c.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'install')
-rw-r--r--install/update.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/install/update.php b/install/update.php
index 06084a422..f9f1d0a3c 100644
--- a/install/update.php
+++ b/install/update.php
@@ -2524,8 +2524,13 @@ function update_r1188() {
function update_r1189() {
$r1 = q("alter table mail add mail_mimetype varchar(64) not null default 'text/bbcode' ");
- $r2 = q("alter table mail add mail_raw int(4) not null default '0' ");
+ if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+ $r2 = q("alter table mail add mail_raw smallint not null default 0 ");
+ }
+ else {
+ $r2 = q("alter table mail add mail_raw tinyint(4) not null default 0 ");
+ }
if($r1 && $r2)
return UPDATE_SUCCESS;
return UPDATE_FAILED;