Skip to content

Database Media Storage : Fixed error in database deleteFolder function. Now correctly deletes folder #24088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,14 @@ public function deleteFolder($folderName = '')
return;
}

$likeExpression = $this->_resourceHelper->addLikeEscape($folderName . '/', ['position' => 'start']);
$this->getConnection()->delete(
$this->getMainTable(),
new \Zend_Db_Expr('filename LIKE ' . $likeExpression)
new \Zend_Db_Expr(
'directory LIKE ' .
$this->_resourceHelper->addLikeEscape($folderName . '/', ['position' => 'start'])
. ' ' . \Magento\Framework\DB\Select::SQL_OR . ' ' .
$this->getConnection()->prepareSqlCondition('directory', ['seq' => $folderName])
)
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\MediaStorage\Helper\File\Storage;

use Magento\Framework\ObjectManagerInterface;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\Framework\Filesystem\Directory\WriteInterface;
use Magento\Framework\Filesystem;
use Magento\Framework\App\Filesystem\DirectoryList;

/**
* Integration tests for Magento\MediaStorage\Helper\File\Storage\Database
*/
class DatabaseTest extends \PHPUnit\Framework\TestCase
{
/**
* @var ObjectManagerInterface
*/
private $objectManager;

/**
* @var Database
*/
private $databaseHelper;

/**
* @var WriteInterface
*/
private $mediaDirectory;

/**
* @var Filesystem
*/
private $filesystem;

/**
* @inheritDoc
*/
protected function setUp()
{
parent::setUp();
$this->objectManager = Bootstrap::getObjectManager();
$this->filesystem = $this->objectManager->get(Filesystem::class);
$this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
}

/**
* test for \Magento\MediaStorage\Model\File\Storage\Database::deleteFolder()
*
* @magentoDataFixture Magento/MediaStorage/_files/database_mode.php
*/
public function testDeleteFolder()
{
$this->databaseHelper = $this->objectManager->get(
Database::class
);

$filenames = [
'test1/test2/test3/test4.dat',
'test1/test2/test3/test4a.dat',
'test5/test6/test7.dat',
'test5/test6a/test7a.dat',
'test8/test9.dat'
];

foreach ($filenames as $filename) {
$this->mediaDirectory->writeFile($filename, '');
$this->databaseHelper->saveFile($filename);
$this->assertEquals(true, $this->databaseHelper->fileExists($filename));
}

$this->databaseHelper->deleteFolder('test1/test2/test3');
$this->databaseHelper->deleteFolder('test5');
$this->databaseHelper->deleteFolder('test8');

foreach ($filenames as $filename) {
$this->assertEquals(false, $this->databaseHelper->fileExists($filename));
$this->mediaDirectory->delete($filename);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
*/
declare(strict_types=1);

/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
/** @var $objectManager \Magento\TestFramework\ObjectManager */
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();

/** @var $database \Magento\MediaStorage\Helper\File\Storage\Database */
$database = $objectManager->get(\Magento\MediaStorage\Helper\File\Storage\Database::class);

$database->getStorageDatabaseModel()->init();

$config = $objectManager->get(Magento\Framework\App\Config\ConfigResource\ConfigInterface::class);
Expand Down