X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FView.php;h=a31151c2117a3d8d63a848372f2515d3164a4ac2;hb=e8fee5644b5e746f8c09e604caac3d678f376989;hp=bfdcdff7caf7c78a25a74bc72b76e985da859b0b;hpb=7e6a9bd893eee66dfb1119bd291fa993e0688706;p=friendica.git

diff --git a/src/Database/View.php b/src/Database/View.php
index bfdcdff7ca..a31151c211 100644
--- a/src/Database/View.php
+++ b/src/Database/View.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -77,6 +77,20 @@ class View
 
 	public static function create(bool $verbose, bool $action)
 	{
+		// Delete previously used views that aren't used anymore
+		foreach(['post-view', 'post-thread-view'] as $view) {
+			if (self::isView($view)) {
+				$sql = sprintf("DROP VIEW IF EXISTS `%s`", DBA::escape($view));
+				if (!empty($sql) && $verbose) {
+					echo $sql . ";\n";
+				}
+		
+				if (!empty($sql) && $action) {
+					DBA::e($sql);
+				}
+			}
+		}
+
 		$definition = self::definition();
 
 		foreach ($definition as $name => $structure) {
@@ -88,7 +102,7 @@ class View
 	{
 		$database = self::definition($basePath, false);
 
-		foreach ($database AS $name => $structure) {
+		foreach ($database as $name => $structure) {
 			echo "--\n";
 			echo "-- VIEW $name\n";
 			echo "--\n";
@@ -103,7 +117,7 @@ class View
 		$r = true;
 
 		$sql_rows = [];
-		foreach ($structure["fields"] AS $fieldname => $origin) {
+		foreach ($structure["fields"] as $fieldname => $origin) {
 			if (is_string($origin)) {
 				$sql_rows[] = $origin . " AS `" . DBA::escape($fieldname) . "`";
 			} elseif (is_array($origin) && (sizeof($origin) == 2)) {
@@ -112,16 +126,16 @@ class View
 		}
 
 		if (self::isView($name)) {
-			$sql = sprintf("DROP VIEW `%s`", DBA::escape($name));
+			$sql = sprintf("DROP VIEW IF EXISTS `%s`", DBA::escape($name));
 		} elseif (self::isTable($name)) {
-			$sql = sprintf("DROP TABLE `%s`", DBA::escape($name));
+			$sql = sprintf("DROP TABLE IF EXISTS `%s`", DBA::escape($name));
 		}
 
-		if ($verbose) {
+		if (!empty($sql) && $verbose) {
 			echo $sql . ";\n";
 		}
 
-		if ($action) {
+		if (!empty($sql) && $action) {
 			DBA::e($sql);
 		}
 
@@ -158,7 +172,7 @@ class View
 	}
 
 	/**
-	 * Check if the given table/view is a view
+	 * Check if the given table/view is a table
 	 *
 	 * @param string $table
 	 * @return boolean "true" if it's a table
@@ -168,10 +182,10 @@ class View
 		$status = DBA::selectFirst(['INFORMATION_SCHEMA' => 'TABLES'], ['TABLE_TYPE'],
 			['TABLE_SCHEMA' => DBA::databaseName(), 'TABLE_NAME' => $table]);
 
-			if (empty($status['TABLE_TYPE'])) {
-				return false;
-			}
+		if (empty($status['TABLE_TYPE'])) {
+			return false;
+		}
 
-			return $status['TABLE_TYPE'] == 'BASE TABLE';
+		return $status['TABLE_TYPE'] == 'BASE TABLE';
 	}
 }