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

Merge pull request #1133 from nextcloud/fix-numerous 

always return numeric storage id as int, also check type equality in …
pull/1169/head
Joas Schilling 2016-08-29 15:48:36 +07:00 committed by GitHub
parent 1bcb5cc6dc d5518735c9
commit 05228a19c4
2 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/Files/Cache/Storage.php
Unescape Escape View File

@ -57,15 +57,15 @@ class Storage {
$this->storageId = self::adjustStorageId($this->storageId);
if ($row = self::getStorageById($this->storageId)) {
$this->numericId = $row['numeric_id'];
$this->numericId = (int)$row['numeric_id'];
} else {
$connection = \OC::$server->getDatabaseConnection();
$available = $isAvailable ? 1 : 0;
if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
$this->numericId = $connection->lastInsertId('*PREFIX*storages');
$this->numericId = (int)$connection->lastInsertId('*PREFIX*storages');
} else {
if ($row = self::getStorageById($this->storageId)) {
$this->numericId = $row['numeric_id'];
$this->numericId = (int)$row['numeric_id'];
} else {
throw new \RuntimeException('Storage could neither be inserted nor be selected from the database');
}
@ -132,7 +132,7 @@ class Storage {
$storageId = self::adjustStorageId($storageId);
if ($row = self::getStorageById($storageId)) {
return $row['numeric_id'];
return (int)$row['numeric_id'];
} else {
return null;
}

44
tests/lib/Repair/RepairLegacyStoragesTest.php
Unescape Escape View File

@ -98,23 +98,9 @@ class RepairLegacyStoragesTest extends TestCase {
$storageId = Storage::adjustStorageId($storageId);
$numRows = $this->connection->executeUpdate($sql, array($storageId));
$this->assertEquals(1, $numRows);
$this->assertSame(1, $numRows);
return \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*storages');
}
/**
* Returns the storage id based on the numeric id
*
* @param int $storageId numeric id of the storage
* @return string storage id or null if not found
*/
private function getStorageId($storageId) {
$numericId = Storage::getNumericStorageId($storageId);
if (!is_null($numericId)) {
return (int)$numericId;
}
return null;
return (int)\OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*storages');
}
/**
@ -144,8 +130,8 @@ class RepairLegacyStoragesTest extends TestCase {
$this->repair->run($this->outputMock);
$this->assertNull($this->getStorageId($this->legacyStorageId));
$this->assertEquals($newStorageNumId, $this->getStorageId($this->newStorageId));
$this->assertNull(Storage::getNumericStorageId($this->legacyStorageId));
$this->assertSame($newStorageNumId, Storage::getNumericStorageId($this->newStorageId));
}
/**
@ -163,8 +149,8 @@ class RepairLegacyStoragesTest extends TestCase {
$this->repair->run($this->outputMock);
$this->assertNull($this->getStorageId($this->legacyStorageId));
$this->assertEquals($legacyStorageNumId, $this->getStorageId($this->newStorageId));
$this->assertNull(Storage::getNumericStorageId($this->legacyStorageId));
$this->assertSame($legacyStorageNumId, Storage::getNumericStorageId($this->newStorageId));
}
/**
@ -185,8 +171,8 @@ class RepairLegacyStoragesTest extends TestCase {
$this->repair->run($this->outputMock);
$this->assertNull($this->getStorageId($this->legacyStorageId));
$this->assertEquals($legacyStorageNumId, $this->getStorageId($this->newStorageId));
$this->assertNull(Storage::getNumericStorageId($this->legacyStorageId));
$this->assertSame($legacyStorageNumId, Storage::getNumericStorageId($this->newStorageId));
}
/**
@ -208,8 +194,8 @@ class RepairLegacyStoragesTest extends TestCase {
$this->repair->run($this->outputMock);
$this->assertNull($this->getStorageId($this->legacyStorageId));
$this->assertEquals($newStorageNumId, $this->getStorageId($this->newStorageId));
$this->assertNull(Storage::getNumericStorageId($this->legacyStorageId));
$this->assertSame($newStorageNumId, Storage::getNumericStorageId($this->newStorageId));
}
/**
@ -233,8 +219,8 @@ class RepairLegacyStoragesTest extends TestCase {
$this->repair->run($this->outputMock);
// storages left alone
$this->assertEquals($legacyStorageNumId, $this->getStorageId($this->legacyStorageId));
$this->assertEquals($newStorageNumId, $this->getStorageId($this->newStorageId));
$this->assertSame($legacyStorageNumId, Storage::getNumericStorageId($this->legacyStorageId));
$this->assertSame($newStorageNumId, Storage::getNumericStorageId($this->newStorageId));
// do not set the done flag
$this->assertNotEquals('yes', $this->config->getAppValue('core', 'repairlegacystoragesdone'));
@ -255,7 +241,7 @@ class RepairLegacyStoragesTest extends TestCase {
$this->repair->run($this->outputMock);
$this->assertEquals($numId, $this->getStorageId($storageId));
$this->assertSame($numId, Storage::getNumericStorageId($storageId));
}
/**
@ -273,7 +259,7 @@ class RepairLegacyStoragesTest extends TestCase {
$this->repair->run($this->outputMock);
$this->assertEquals($numId, $this->getStorageId($storageId));
$this->assertSame($numId, Storage::getNumericStorageId($storageId));
}
/**
@ -291,7 +277,7 @@ class RepairLegacyStoragesTest extends TestCase {
$this->repair->run($this->outputMock);
$this->assertEquals($numId, $this->getStorageId($storageId));
$this->assertSame($numId, Storage::getNumericStorageId($storageId));
}
/**