Skip to content
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

fix getTableNamesWithoutPrefix() #27119

Closed
Closed
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
16 changes: 11 additions & 5 deletions lib/private/DB/SchemaWrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,30 @@ public function performDropTableCalls() {
*
* @return array
*/
public function getTableNamesWithoutPrefix() {
$tableNames = $this->schema->getTableNames();
public function getTableNamesWithoutPrefix(): array {
return array_map(function ($tableName) {
if (strpos($tableName, $this->connection->getPrefix()) === 0) {
return substr($tableName, strlen($this->connection->getPrefix()));
}

return $tableName;
}, $tableNames);
}, $this->getTableNames());
}

// Overwritten methods

/**
* @return array
*/
public function getTableNames() {
return $this->schema->getTableNames();
public function getTableNames(): array {
return array_map(static function (string $fullName) {
$pos = strpos($fullName, '.');
if ($pos === false) {
return $fullName;
}

return substr($fullName, $pos + 1);
}, $this->schema->getTableNames());
}

/**
Expand Down
57 changes: 57 additions & 0 deletions tests/lib/DB/SchemaWrapperTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?php

declare(strict_types=1);
/**
* @copyright Copyright (c) 2021 Joas Schilling <coding@schilljs.com>
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

namespace Test\DB;

use OC\DB\Connection;
use OC\DB\SchemaWrapper;

/**
* Class SchemaWrapperTest
*
* @group DB
*
* @package Test\DB
*/
class SchemaWrapperTest extends \Test\TestCase {
/** @var \Doctrine\DBAL\Connection $connection */
private $connection;

protected function setUp(): void {
parent::setUp();

$this->connection = \OC::$server->get(Connection::class);
}

public function testGetTableNames(): void {
$schema = new SchemaWrapper($this->connection);
self::assertContains('oc_share', $schema->getTableNames());
}

public function testGetTableNamesWithoutPrefix(): void {
$schema = new SchemaWrapper($this->connection);
self::assertContains('share', $schema->getTableNamesWithoutPrefix());
}
}