sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only try to delete migration.db if it was created.

remotes/origin/stable4
Tom Needham 2012-09-18 16:25:34 +07:00
parent 3b465f419a
commit a5c42edbe5
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/migration/content.php
Unescape Escape View File

@ -30,8 +30,9 @@ class OC_Migration_Content{
// Holds the MDB2 object
private $db=null;
// Holds an array of tmpfiles to delete after zip creation
private $tmpfiles=false;
private $tmpfiles=array();
/**
* @brief sets up the
* @param $zip ZipArchive object
@ -42,18 +43,21 @@ class OC_Migration_Content{
$this->zip = $zip;
$this->db = $db;
if( !is_null( $db ) ){
// Get db path
$db = $this->db->getDatabase();
$this->tmpfiles[] = $db;
}
}
// @brief prepares the db
// @param $query the sql query to prepare
public function prepare( $query ){
public function prepare( $query ) {
// Only add database to tmpfiles if actually used
if( !is_null( $this->db ) ) {
// Get db path
$db = $this->db->getDatabase();
if(!in_array($db, $this->tmpfiles)){
$this->tmpfiles[] = $db;
}
}
// Optimize the query
$query = $this->processQuery( $query );