Mirrors/nextcloud
1
0
Vork 0
kopie van https://github.com/nextcloud/server.git synced 2024-07-30 20:16:04 +02:00
Code Kwesties Actions 42 Packages Projecten Publicaties Wiki Activiteit

lastInsertId() is properly working with Oracle if the table name is properly passed in

Bladeren bron
This commit is contained in:
Thomas Müller 2015-11-19 17:18:22 +01:00
bovenliggende 79bbda994b
commit 9f69021691
4 gewijzigde bestanden met toevoegingen van 8 en 60 verwijderingen
Statistieken weergeven Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

17
lib/private/share/share.php
Bestand weergeven

@ -2332,22 +2332,7 @@ class Share extends Constants {
$id = false;
if ($result) {
$id = \OC::$server->getDatabaseConnection()->lastInsertId();
// Fallback, if lastInterId() doesn't work we need to perform a select
// to get the ID (seems to happen sometimes on Oracle)
if (!$id) {
$getId = \OC_DB::prepare('
SELECT `id`
FROM`*PREFIX*share`
WHERE `uid_owner` = ? AND `item_target` = ? AND `item_source` = ? AND `stime` = ?
');
$r = $getId->execute(array($shareData['uidOwner'], $shareData['itemTarget'], $shareData['itemSource'], $shareData['shareTime']));
if ($r) {
$row = $r->fetchRow();
$id = $row['id'];
}
}
$id = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share');
}
return $id;

16
tests/lib/repair/cleantags.php
Bestand weergeven

@ -165,20 +165,6 @@ class CleanTags extends \Test\TestCase {
* @return int
*/
protected function getLastInsertID($tableName, $idName) {
$id = $this->connection->lastInsertId();
if ($id) {
return $id;
}
// FIXME !!!! ORACLE WORKAROUND DO NOT COPY
// FIXME INSTEAD HELP FIXING DOCTRINE
// FIXME https://github.com/owncloud/core/issues/13303
// FIXME ALSO FIX https://github.com/owncloud/core/commit/2dd85ec984c12d3be401518f22c90d2327bec07a
$qb = $this->connection->getQueryBuilder();
$result = $qb->select($qb->createFunction('MAX(`' . $idName . '`)'))
->from($tableName)
->execute();
return (int) $result->fetchColumn();
return $this->connection->lastInsertId("*PREFIX*$tableName");
}
}

21
tests/lib/repair/oldgroupmembershipsharestest.php
Bestand weergeven

@ -72,7 +72,7 @@ class OldGroupMembershipSharesTest extends \Test\TestCase {
->orderBy('id', 'ASC')
->execute();
$rows = $result->fetchAll();
$this->assertSame([['id' => $parent], ['id' => $group2], ['id' => $user1], ['id' => $member], ['id' => $notAMember]], $rows);
$this->assertEquals([['id' => $parent], ['id' => $group2], ['id' => $user1], ['id' => $member], ['id' => $notAMember]], $rows);
$result->closeCursor();
$repair->run();
@ -83,7 +83,7 @@ class OldGroupMembershipSharesTest extends \Test\TestCase {
->orderBy('id', 'ASC')
->execute();
$rows = $result->fetchAll();
$this->assertSame([['id' => $parent], ['id' => $group2], ['id' => $user1], ['id' => $member]], $rows);
$this->assertEquals([['id' => $parent], ['id' => $group2], ['id' => $user1], ['id' => $member]], $rows);
$result->closeCursor();
}
@ -118,21 +118,6 @@ class OldGroupMembershipSharesTest extends \Test\TestCase {
->values($shareValues)
->execute();
return $this->getLastShareId();
}
/**
* @return int
*/
protected function getLastShareId() {
// select because lastInsertId does not work with OCI
$query = $this->connection->getQueryBuilder();
$result = $query->select('id')
->from('share')
->orderBy('id', 'DESC')
->execute();
$row = $result->fetch();
$result->closeCursor();
return $row['id'];
return $this->connection->lastInsertId('*PREFIX*share');
}
}

14
tests/lib/repair/repairinvalidsharestest.php
Bestand weergeven

@ -162,7 +162,7 @@ class RepairInvalidSharesTest extends TestCase {
->orderBy('id', 'ASC')
->execute();
$rows = $result->fetchAll();
$this->assertSame([['id' => $parent], ['id' => $validChild], ['id' => $invalidChild]], $rows);
$this->assertEquals([['id' => $parent], ['id' => $validChild], ['id' => $invalidChild]], $rows);
$result->closeCursor();
$this->repair->run();
@ -173,7 +173,7 @@ class RepairInvalidSharesTest extends TestCase {
->orderBy('id', 'ASC')
->execute();
$rows = $result->fetchAll();
$this->assertSame([['id' => $parent], ['id' => $validChild]], $rows);
$this->assertEquals([['id' => $parent], ['id' => $validChild]], $rows);
$result->closeCursor();
}
@ -181,15 +181,7 @@ class RepairInvalidSharesTest extends TestCase {
* @return int
*/
protected function getLastShareId() {
// select because lastInsertId does not work with OCI
$query = $this->connection->getQueryBuilder();
$result = $query->select('id')
->from('share')
->orderBy('id', 'DESC')
->execute();
$row = $result->fetch();
$result->closeCursor();
return $row['id'];
return $this->connection->lastInsertId('*PREFIX*share');
}
}