mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Tom Needham 2012-09-18 16:25:34 +00:00
parent be76a55ef0
commit 30188847a3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/migration/content.php
View File

@ -30,7 +30,7 @@ class OC_Migration_Content{
// Holds the MDB2 object // Holds the MDB2 object
private $db=null; private $db=null;
// Holds an array of tmpfiles to delete after zip creation // Holds an array of tmpfiles to delete after zip creation
private $tmpfiles=false; private $tmpfiles=array();
/** /**
* @brief sets up the * @brief sets up the
@ -43,18 +43,21 @@ class OC_Migration_Content{
$this->zip = $zip; $this->zip = $zip;
$this->db = $db; $this->db = $db;
if( !is_null( $db ) ) {
// Get db path
$db = $this->db->getDatabase();
$this->tmpfiles[] = $db;
}
} }
// @brief prepares the db // @brief prepares the db
// @param $query the sql query to prepare // @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 // Optimize the query
$query = $this->processQuery( $query ); $query = $this->processQuery( $query );