diff options
| -rw-r--r-- | lib/private/db.php | 15 | ||||
| -rw-r--r-- | lib/private/files/cache/storage.php | 2 | ||||
| -rw-r--r-- | lib/private/share/share.php | 2 | ||||
| -rw-r--r-- | tests/lib/db.php | 4 | ||||
| -rw-r--r-- | tests/lib/repair/repairlegacystorage.php | 2 |
5 files changed, 5 insertions, 20 deletions
diff --git a/lib/private/db.php b/lib/private/db.php index f5f0c8798cd..14d9ba0a493 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -158,21 +158,6 @@ class OC_DB { } /** - * gets last value of autoincrement - * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix - * @return string id - * @throws \OC\DatabaseException - * - * \Doctrine\DBAL\Connection lastInsertId - * - * Call this method right after the insert command or other functions may - * cause trouble! - */ - public static function insertid($table=null) { - return \OC::$server->getDatabaseConnection()->lastInsertId($table); - } - - /** * saves database schema to xml file * @param string $file name of file * @param int $mode diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php index cee69194095..e5235d1ca92 100644 --- a/lib/private/files/cache/storage.php +++ b/lib/private/files/cache/storage.php @@ -61,7 +61,7 @@ class Storage { $connection = \OC_DB::getConnection(); $available = $isAvailable ? 1 : 0; if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) { - $this->numericId = \OC_DB::insertid('*PREFIX*storages'); + $this->numericId = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*storages'); } else { if ($row = self::getStorageById($this->storageId)) { $this->numericId = $row['numeric_id']; diff --git a/lib/private/share/share.php b/lib/private/share/share.php index b10de850356..2b251dba1e0 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -2191,7 +2191,7 @@ class Share extends Constants { if ($isGroupShare) { $id = self::insertShare($queriesToExecute['groupShare']); // Save this id, any extra rows for this group share will need to reference it - $parent = \OC_DB::insertid('*PREFIX*share'); + $parent = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*share'); unset($queriesToExecute['groupShare']); } diff --git a/tests/lib/db.php b/tests/lib/db.php index 95eca4774b7..88c9ee75b3b 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -111,11 +111,11 @@ class Test_DB extends \Test\TestCase { public function testLastInsertId() { $query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (?,?)'); $result1 = OC_DB::executeAudited($query, array('insertid 1','uri_1')); - $id1 = OC_DB::insertid('*PREFIX*'.$this->table2); + $id1 = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*'.$this->table2); // we don't know the id we should expect, so insert another row $result2 = OC_DB::executeAudited($query, array('insertid 2','uri_2')); - $id2 = OC_DB::insertid('*PREFIX*'.$this->table2); + $id2 = \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*'.$this->table2); // now we can check if the two ids are in correct order $this->assertGreaterThan($id1, $id2); } diff --git a/tests/lib/repair/repairlegacystorage.php b/tests/lib/repair/repairlegacystorage.php index 44afd6125ab..3ae6578f7ec 100644 --- a/tests/lib/repair/repairlegacystorage.php +++ b/tests/lib/repair/repairlegacystorage.php @@ -99,7 +99,7 @@ class RepairLegacyStorages extends TestCase { $numRows = $this->connection->executeUpdate($sql, array($storageId)); $this->assertEquals(1, $numRows); - return \OC_DB::insertid('*PREFIX*storages'); + return \OC::$server->getDatabaseConnection()->lastInsertId('*PREFIX*storages'); } /** |