@@ -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; |
@@ -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"); | |||
} | |||
} |
@@ -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'); | |||
} | |||
} |
@@ -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'); | |||
} | |||
} | |||