Merge remote-tracking branch 'origin/master'

[friendica.git] / update.php

diff --git a/update.php b/update.php
index fe8052b00ff9106bcc141bb6276e755f9601530a..3672b2bfee88388ec6a355487ec13c96db09b6ec 100644 (file)
--- a/update.php
+++ b/update.php
@@ -326,7 +326,7 @@ function update_1033() {
                `k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
                `v` TEXT NOT NULL,
                `updated` DATETIME NOT NULL
-               ) ENGINE = MYISAM DEFAULT CHARSET=utf8;");
+               ) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
 }
 
 
@@ -377,3 +377,44 @@ function update_1038() {
 function update_1039() {
        q("ALTER TABLE `addon` ADD `timestamp` BIGINT NOT NULL DEFAULT '0'");
 }
+
+
+function update_1040() {
+
+       q("CREATE TABLE IF NOT EXISTS `fcontact` (
+       `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+       `url` CHAR( 255 ) NOT NULL ,
+       `name` CHAR( 255 ) NOT NULL ,
+       `photo` CHAR( 255 ) NOT NULL
+       ) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+
+       q("CREATE TABLE IF NOT EXISTS `ffinder` (
+       `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+       `uid` INT UNSIGNED NOT NULL ,
+       `cid` INT UNSIGNED NOT NULL ,
+       `fid` INT UNSIGNED NOT NULL
+       ) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+
+}
+
+function update_1041() {
+       q("ALTER TABLE `profile` CHANGE `keywords` `prv_keywords` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ");
+       q("ALTER TABLE `profile` ADD `pub_keywords` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `religion` ");
+}
+
+function update_1042() {
+       q("ALTER TABLE `user` ADD `expire` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `maxreq` ");
+}
+
+
+function update_1043() {
+       q("ALTER TABLE `user` ADD `blockwall` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocked` ");
+}
+
+function update_1044() {
+       q("ALTER TABLE `profile` ADD FULLTEXT ( `pub_keywords` ) ");
+       q("ALTER TABLE `profile` ADD FULLTEXT ( `prv_keywords` ) ");
+}
+
+
+       
\ No newline at end of file