X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=49287cd0b2a86205a9c944d4f36047fb4b0692bc;hb=254c32ac91cdfd654e64cdc8ae5aef44ee639212;hp=aa043468caa9e40ba64483ffba8a406c5fcd666f;hpb=ead0cf370aa985b895e3db46cd7e3b1dc2bdfff6;p=friendica.git

diff --git a/update.php b/update.php
index aa043468ca..49287cd0b2 100644
--- a/update.php
+++ b/update.php
@@ -240,9 +240,12 @@ function pre_update_1348()
 
 	update_1348();
 
-	DBA::e("DELETE FROM `auth_codes` WHERE NOT `client_id` IN (SELECT `client_id` FROM `clients`)");
-	DBA::e("DELETE FROM `tokens` WHERE NOT `client_id` IN (SELECT `client_id` FROM `clients`)");
-
+	if (DBStructure::existsTable('auth_codes') && DBStructure::existsTable('clients')) {
+		DBA::e("DELETE FROM `auth_codes` WHERE NOT `client_id` IN (SELECT `client_id` FROM `clients`)");
+	}
+	if (DBStructure::existsTable('tokens') && DBStructure::existsTable('clients')) {
+		DBA::e("DELETE FROM `tokens` WHERE NOT `client_id` IN (SELECT `client_id` FROM `clients`)");
+	}
 	return Update::SUCCESS;
 }
 
@@ -251,7 +254,7 @@ function update_1348()
 	// Insert a permissionset with id=0
 	// Inserting it without an ID and then changing the value to 0 tricks the auto increment
 	if (!DBA::exists('permissionset', ['id' => 0])) {
-		DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);	
+		DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);
 		$lastid = DBA::lastInsertId();
 		if ($lastid != 0) {
 			DBA::update('permissionset', ['id' => 0], ['id' => $lastid]);
@@ -391,7 +394,7 @@ function pre_update_1364()
 		return Update::FAILED;
 	}
 
-	if (!DBA::e("DELETE FROM `clients` WHERE NOT `uid` IN (SELECT `uid` FROM `user`)")) {
+	if (DBStructure::existsTable('clients') && !DBA::e("DELETE FROM `clients` WHERE NOT `uid` IN (SELECT `uid` FROM `user`)")) {
 		return Update::FAILED;
 	}
 
@@ -443,7 +446,7 @@ function pre_update_1364()
 		return Update::FAILED;
 	}
 
-	if (!DBA::e("DELETE FROM `profile_check` WHERE NOT `uid` IN (SELECT `uid` FROM `user`)")) {
+	if (DBStructure::existsTable('profile_check') && !DBA::e("DELETE FROM `profile_check` WHERE NOT `uid` IN (SELECT `uid` FROM `user`)")) {
 		return Update::FAILED;
 	}
 
@@ -463,7 +466,7 @@ function pre_update_1364()
 		return Update::FAILED;
 	}
 
-	if (!DBA::e("DELETE FROM `tokens` WHERE NOT `uid` IN (SELECT `uid` FROM `user`)")) {
+	if (DBStructure::existsTable('tokens') && !DBA::e("DELETE FROM `tokens` WHERE NOT `uid` IN (SELECT `uid` FROM `user`)")) {
 		return Update::FAILED;
 	}
 
@@ -495,7 +498,7 @@ function pre_update_1364()
 		return Update::FAILED;
 	}
 
-	if (!DBA::e("DELETE FROM `profile_check` WHERE NOT `cid` IN (SELECT `id` FROM `contact`)")) {
+	if (DBStructure::existsTable('profile_check') && !DBA::e("DELETE FROM `profile_check` WHERE NOT `cid` IN (SELECT `id` FROM `contact`)")) {
 		return Update::FAILED;
 	}
 
@@ -694,16 +697,30 @@ function update_1396()
 		return Update::SUCCESS;
 	}
 
-	if (!DBA::e("INSERT IGNORE INTO `post-content`(`uri-id`, `title`, `content-warning`, `body`, `raw-body`,
-		`location`, `coord`, `language`, `app`, `rendered-hash`, `rendered-html`,
-		`object-type`, `object`, `target-type`, `target`, `resource-id`, `plink`)
-		SELECT `item-content`.`uri-id`, `item-content`.`title`, `item-content`.`content-warning`,
-			`item-content`.`body`, `item-content`.`raw-body`, `item-content`.`location`, `item-content`.`coord`,
-			`item-content`.`language`, `item-content`.`app`, `item-content`.`rendered-hash`,
-			`item-content`.`rendered-html`, `item-content`.`object-type`, `item-content`.`object`,
-			`item-content`.`target-type`, `item-content`.`target`, `item`.`resource-id`, `item-content`.`plink`
-			FROM `item-content` INNER JOIN `item` ON `item`.`uri-id` = `item-content`.`uri-id`")) {
-		return Update::FAILED;
+	if (DBStructure::existsColumn('item-content', ['raw-body'])) {
+		if (!DBA::e("INSERT IGNORE INTO `post-content`(`uri-id`, `title`, `content-warning`, `body`, `raw-body`,
+			`location`, `coord`, `language`, `app`, `rendered-hash`, `rendered-html`,
+			`object-type`, `object`, `target-type`, `target`, `resource-id`, `plink`)
+			SELECT `item-content`.`uri-id`, `item-content`.`title`, `item-content`.`content-warning`,
+				`item-content`.`body`, `item-content`.`raw-body`, `item-content`.`location`, `item-content`.`coord`,
+				`item-content`.`language`, `item-content`.`app`, `item-content`.`rendered-hash`,
+				`item-content`.`rendered-html`, `item-content`.`object-type`, `item-content`.`object`,
+				`item-content`.`target-type`, `item-content`.`target`, `item`.`resource-id`, `item-content`.`plink`
+				FROM `item-content` INNER JOIN `item` ON `item`.`uri-id` = `item-content`.`uri-id`")) {
+			return Update::FAILED;
+		}
+	} else {
+		if (!DBA::e("INSERT IGNORE INTO `post-content`(`uri-id`, `title`, `content-warning`, `body`,
+			`location`, `coord`, `language`, `app`, `rendered-hash`, `rendered-html`,
+			`object-type`, `object`, `target-type`, `target`, `resource-id`, `plink`)
+			SELECT `item-content`.`uri-id`, `item-content`.`title`, `item-content`.`content-warning`,
+				`item-content`.`body`, `item-content`.`location`, `item-content`.`coord`,
+				`item-content`.`language`, `item-content`.`app`, `item-content`.`rendered-hash`,
+				`item-content`.`rendered-html`, `item-content`.`object-type`, `item-content`.`object`,
+				`item-content`.`target-type`, `item-content`.`target`, `item`.`resource-id`, `item-content`.`plink`
+				FROM `item-content` INNER JOIN `item` ON `item`.`uri-id` = `item-content`.`uri-id`")) {
+			return Update::FAILED;
+		}
 	}
 	return Update::SUCCESS;
 }
@@ -767,8 +784,8 @@ function update_1398()
 function update_1399()
 {
 	if (!DBA::e("UPDATE `post-thread-user` INNER JOIN `post-user` ON `post-user`.`uid` = `post-thread-user`.`uid` AND `post-user`.`uri-id` = `post-thread-user`.`uri-id`
-		SET `post-thread-user`.`contact-id` = `post-user`.`contact-id`, `post-thread-user`.`unseen` = `post-user`.`unseen`, 
-		`post-thread-user`.`hidden` = `post-user`.`hidden`, `post-thread-user`.`origin` = `post-user`.`origin`, 
+		SET `post-thread-user`.`contact-id` = `post-user`.`contact-id`, `post-thread-user`.`unseen` = `post-user`.`unseen`,
+		`post-thread-user`.`hidden` = `post-user`.`hidden`, `post-thread-user`.`origin` = `post-user`.`origin`,
 		`post-thread-user`.`psid` = `post-user`.`psid`, `post-thread-user`.`post-user-id` = `post-user`.`id`")) {
 			return Update::FAILED;
 	}
@@ -780,7 +797,7 @@ function update_1400()
 {
 	if (!DBA::e("INSERT IGNORE INTO `post` (`uri-id`, `parent-uri-id`, `thr-parent-id`, `owner-id`, `author-id`, `network`,
 		`created`, `received`, `edited`, `gravity`, `causer-id`, `post-type`, `vid`, `private`, `visible`, `deleted`, `global`)
-		SELECT `uri-id`, `parent-uri-id`, `thr-parent-id`, `owner-id`, `author-id`, `network`, `created`, `received`, `edited`, 
+		SELECT `uri-id`, `parent-uri-id`, `thr-parent-id`, `owner-id`, `author-id`, `network`, `created`, `received`, `edited`,
 			`gravity`, `causer-id`, `post-type`, `vid`, `private`, `visible`, `deleted`, `global` FROM `item`")) {
 			return Update::FAILED;
 	}
@@ -826,7 +843,7 @@ function update_1400()
 function pre_update_1403()
 {
 	// Necessary before a primary key change
-	if (!DBA::e("DROP TABLE `parsed_url`")) {
+	if (DBStructure::existsTable('parsed_url') && !DBA::e("DROP TABLE `parsed_url`")) {
 		return Update::FAILED;
 	}
 
@@ -838,11 +855,11 @@ function update_1404()
 	$tasks = DBA::select('workerqueue', ['id', 'command', 'parameter'], ['command' => ['notifier', 'delivery', 'apdelivery', 'done' => false]]);
 	while ($task = DBA::fetch($tasks)) {
 		$parameters = json_decode($task['parameter'], true);
-	
+
 		if (is_array($parameters) && count($parameters) && in_array($parameters[0], [Delivery::MAIL, Delivery::SUGGESTION, Delivery::REMOVAL, Delivery::RELOCATION])) {
 			continue;
 		}
-	
+
 		switch (strtolower($task['command'])) {
 			case 'notifier':
 				if (count($parameters) == 3) {
@@ -852,7 +869,7 @@ function update_1404()
 				if (!DBA::isResult($item)) {
 					continue 2;
 				}
-	
+
 				$parameters[1] = $item['uri-id'];
 				$parameters[2] = $item['uid'];
 				break;
@@ -864,7 +881,7 @@ function update_1404()
 				if (!DBA::isResult($item)) {
 					continue 2;
 				}
-	
+
 				$parameters[1] = $item['uri-id'];
 				$parameters[3] = $item['uid'];
 				break;
@@ -872,16 +889,16 @@ function update_1404()
 				if (count($parameters) == 6) {
 					continue 2;
 				}
-	
+
 				if (empty($parameters[4])) {
 					$parameters[4] = [];
 				}
-	
+
 				$item = DBA::selectFirst('item', ['uri-id'], ['id' => $parameters[1]]);
 				if (!DBA::isResult($item)) {
 					continue 2;
 				}
-	
+
 				$parameters[5] = $item['uri-id'];
 				break;
 			default:
@@ -945,3 +962,47 @@ function update_1419()
 	}
 	return Update::SUCCESS;
 }
+
+function update_1429()
+{
+	if (!DBA::e("UPDATE `contact` SET `uri-id` = null WHERE NOT `uri-id` IS NULL")) {
+		return Update::FAILED;
+	}
+
+	if (!DBA::e("UPDATE `fcontact` SET `uri-id` = null WHERE NOT `uri-id` IS NULL")) {
+		return Update::FAILED;
+	}
+
+	if (!DBA::e("UPDATE `apcontact` SET `uri-id` = null WHERE NOT `uri-id` IS NULL")) {
+		return Update::FAILED;
+	}
+
+	DI::config()->set("system", "post_update_version", 1423);
+
+	return Update::SUCCESS;
+}
+
+function update_1434()
+{
+	$name = DI::config()->get('storage', 'name');
+
+	// in case of an empty config, set "Database" as default storage backend
+	if (empty($name)) {
+		DI::config()->set('storage', 'name', Storage\Database::getName());
+	}
+
+	// In case of a Using deprecated storage class value, set the right name for it
+	if (stristr($name, 'Friendica\Model\Storage\\')) {
+		DI::config()->set('storage', 'name', substr($name, 24));
+	}
+
+	return Update::SUCCESS;
+}
+
+function update_1435()
+{
+	$contacts = DBA::select('contact', [], ["`uid` != ?", 0]);
+	while ($contact = DBA::fetch($contacts)) {
+		Contact\User::insertForContactArray($contact);
+	}
+}
\ No newline at end of file