From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Sat, 25 Jan 2020 10:05:14 +0000 (+0100)
Subject: Backup and Restore: Added support for views (@oakstreet1)
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=c34e563fae8003a637a485b4eaf634678b90c60f

Backup and Restore: Added support for views (@oakstreet1)
---

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index e574fc98..ba4d0892 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -282,7 +282,9 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 		"drop function if exists" => 'drop_queries',
 		"drop trigger if exists" => 'drop_queries',
 		"select" => 'data_queries', 
-		"delete" => 'data_queries', 
+		"delete" => 'data_queries',
+		"drop view if exists" => 'drop_queries',
+		"create view as" => 'data_queries'		//we should be able to create views after all tables have been created 
 		);
 
 	$protected = array(
@@ -645,96 +647,119 @@ function db_export($conn, $filename, $zip='no', $comment='')
 	{
 		foreach ($all_tables as $row)
 		{
-			$tablename = $row['Name'];
-			$auto_incr[$tablename] = $row['Auto_increment'];
-
-			$out.="\n\n";
-			// export tables
-			$out.="### Structure of table `".$tablename."` ###\n\n";
-
-			$out.="DROP TABLE IF EXISTS `".$tablename."`;\n\n";
-			$out.=$table_sql[$tablename];
-
-			$out.=" ;";
-			$out.="\n\n";
-
-			// export data
-			if (!$error)
-			{
-				$out.="### Data of table `".$tablename."` ###\n";
-
-				// check if field types are NULL or NOT NULL
-				$res3 = db_query("SHOW COLUMNS FROM `" . $tablename . "`");
-
-				$field_null = array();
-				for ($j = 0; $j < db_num_rows($res3); $j++)
-				{
-					$row3 = db_fetch($res3);
-					$field_null[] = $row3[2]=='YES' && $row3[4]===null;
-				}
-
-				$res2 = db_query("SELECT * FROM `" . $tablename . "`");
-				$maxinsert = 0;
-				$insert = '';
-				for ($j = 0; $j < db_num_rows($res2); $j++)
+			if (!empty($row['Engine'])) {	//don't export views like tables
+				$tablename = $row['Name'];
+				$auto_incr[$tablename] = $row['Auto_increment'];
+	
+				$out.="\n\n";
+				// export tables
+				$out.="### Structure of table `".$tablename."` ###\n\n";
+	
+				$out.="DROP TABLE IF EXISTS `".$tablename."`;\n\n";
+				$out.=$table_sql[$tablename];
+	
+				$out.=" ;";
+				$out.="\n\n";
+	
+				// export data
+				if (!$error)
 				{
-					$row2 = db_fetch_row($res2);
-					$values = '(';
-					for ($k = 0; $k < $nf = db_num_fields($res2); $k++)
+					$out.="### Data of table `".$tablename."` ###\n";
+	
+					// check if field types are NULL or NOT NULL
+					$res3 = db_query("SHOW COLUMNS FROM `" . $tablename . "`");
+	
+					$field_null = array();
+					for ($j = 0; $j < db_num_rows($res3); $j++)
 					{
-						$values .= db_escape($row2[$k], $field_null[$k]);
-						if ($k < ($nf - 1))
-							$values .= ', ';
+						$row3 = db_fetch($res3);
+						$field_null[] = $row3[2]=='YES' && $row3[4]===null;
 					}
-					$values .= ')';
-					$len = strlen($values);
-					if ($maxinsert < $len+1)
+	
+					$res2 = db_query("SELECT * FROM `" . $tablename . "`");
+					$maxinsert = 0;
+					$insert = '';
+					for ($j = 0; $j < db_num_rows($res2); $j++)
 					{
-						$maxinsert = EXPORT_MAX_INSERT;
-						if ($insert)
+						$row2 = db_fetch_row($res2);
+						$values = '(';
+						for ($k = 0; $k < $nf = db_num_fields($res2); $k++)
 						{
-							$out .= $insert .';'; // flush insert query
-							$insert = '';
+							$values .= db_escape($row2[$k], $field_null[$k]);
+							if ($k < ($nf - 1))
+								$values .= ', ';
+						}
+						$values .= ')';
+						$len = strlen($values);
+						if ($maxinsert < $len+1)
+						{
+							$maxinsert = EXPORT_MAX_INSERT;
+							if ($insert)
+							{
+								$out .= $insert .';'; // flush insert query
+								$insert = '';
+							}
+						}
+	
+						if ($insert == '')
+						{
+							$insert = "\nINSERT INTO `" . $tablename . "` VALUES\n";
+							$maxinsert -= strlen($insert);
+						} else {
+							$insert .= ",\n";
+						}
+	
+						$maxinsert -= $len;
+						$insert .= $values;
+	
+						// if saving is successful, then empty $out, else set error flag
+						if (strlen($out) > $max_size && $zip != "zip")
+						{
+							if (save_to_file($backupfile, $zip, $out))
+								$out = "";
+							else
+								$error = true;
 						}
 					}
-
-					if ($insert == '')
-					{
-						$insert = "\nINSERT INTO `" . $tablename . "` VALUES\n";
-						$maxinsert -= strlen($insert);
-					} else {
-						$insert .= ",\n";
-					}
-
-					$maxinsert -= $len;
-					$insert .= $values;
-
-					// if saving is successful, then empty $out, else set error flag
-					if (strlen($out) > $max_size && $zip != "zip")
-					{
-						if (save_to_file($backupfile, $zip, $out))
-							$out = "";
-						else
-							$error = true;
-					}
+					if ($insert)
+						$out .= $insert. ';';
+				// an error occurred! Try to delete file and return error status
+				}
+				elseif ($error)
+				{
+					@unlink($backupfile);
+					return false;
+				}
+	
+				// if saving is successful, then empty $out, else set error flag
+				if (strlen($out) > $max_size && $zip != "zip")
+				{
+					if (save_to_file($backupfile, $zip, $out))
+						$out= "";
+					else
+						$error = true;
+				}
+			}	//end if Engine set (not a view)
+		}
+		//process views last so all tables have been created before views are created
+		foreach ($all_tables as $row)
+		{
+			if (empty($row['Engine'])) {
+				$viewname = $row['Name'];
+				$out .= "\n\nDROP VIEW IF EXISTS `".$viewname."`;\n";
+				//db_get_view_schema() is in /includes/db/connect_db_mysqli.inc because it is mysql specific
+				if (NULL !== ($schema = db_get_view_schema($viewname)))
+				{
+					$out .= "CREATE VIEW `".$viewname."` AS ".$schema.";\n\n";
+					if (!save_to_file($backupfile, $zip, $out)) $error = true;
+					else $out = "";
+				}
+				else $error = true;
+				
+				if ($error) {
+					@unlink($backupfile);
+					return false;
 				}
-				if ($insert)
-					$out .= $insert. ';';
-			// an error occurred! Try to delete file and return error status
-			}
-			elseif ($error)
-			{
-				@unlink($backupfile);
-				return false;
-			}
-
-			// if saving is successful, then empty $out, else set error flag
-			if (strlen($out) > $max_size && $zip != "zip")
-			{
-				if (save_to_file($backupfile, $zip, $out))
-					$out= "";
-				else
-					$error = true;
 			}
 		}
 
diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index b671945a..81bad397 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -116,6 +116,19 @@ function db_get_default_charset()
 	return $var[0];
 }
 
+function db_get_view_schema($view)
+{
+    global $db;
+    $schema = NULL;
+    $qry = "select view_definition from information_schema.views where table_schema=DATABASE() and table_name='$view'";
+    $res = db_query($qry,'Failed to select view schema');
+    if ($res && db_num_rows($res) == 1) {
+        $row = db_fetch_assoc($res);
+        $schema = $row['view_definition'];
+    }
+    return $schema;
+}
+
 /*
 	SQL db profiling stub
 */
@@ -124,4 +137,4 @@ if (!function_exists('db_profile'))
 	function db_profile($sql=false)
 	{
 	}
-}
\ No newline at end of file
+}