Skip to content

Fix/oracle last insert id #52416

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.

Sign up for GitHub

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

Closed
come-nc wants to merge 19 commits into from
Closed

Fix/oracle last insert id #52416

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a17ff95
Delete unused CI for this test PR
come-nc Apr 24, 2025
2fb1b7c
Try to workaround oracles primary key
nickvergessen Jul 9, 2024
5f2fa46
I have no idea what I'm doing
nickvergessen Jul 9, 2024
0650cb5
fixup! I have no idea what I'm doing
nickvergessen Jul 9, 2024
79325cb
attempt at a simpler version
come-nc Apr 24, 2025
35d0b4c
Some insert have no space after VALUES
come-nc Apr 24, 2025
af41202
test quote
come-nc Apr 24, 2025
881ad8f
test quoted id
come-nc Apr 24, 2025
0c6d2b6
test with quoted rowid
come-nc Apr 24, 2025
fa1e750
filecache specific test
come-nc Apr 24, 2025
ea7131c
add test for addressbook id column
come-nc Apr 24, 2025
cf03292
test
come-nc Apr 24, 2025
ffa12d1
test storages
come-nc Apr 24, 2025
196cafc
values is not required for insert into
come-nc Apr 24, 2025
53b986d
fix: Migrate use of deprecated method insertIfNotExists in Storage co…
come-nc Apr 24, 2025
bb6bc3d
fixup duh
come-nc Apr 24, 2025
6a80b8c
details on error
come-nc Apr 24, 2025
7673e60
trying version with declare/begin/end
come-nc Apr 24, 2025
0e7f0c8
semicolon?
come-nc Apr 24, 2025
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
Prev Previous commit
Next Next commit
fix: Migrate use of deprecated method insertIfNotExists in Storage co… 
…nstructor

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Apr 24, 2025
commit 53b986db3bc50596f053a90484cfacac8b75dd9c
12 changes: 9 additions & 3 deletions lib/private/Files/Cache/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,15 @@ public function __construct($storage, $isAvailable, IDBConnection $connection) {
$this->numericId = (int)$row['numeric_id'];
} else {
$available = $isAvailable ? 1 : 0;
if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
$this->numericId = $connection->lastInsertId('*PREFIX*storages');
} else {
try {
$query = $connection->getQueryBuilder();
$query->insert('storages')
->set('id', $query->createNamedParameter($this->storageId))
->set('available', $query->createNamedParameter($available));
$query->executeStatement();
$this->numericId = $query->getLastInsertId();
} catch (\Exception $e) {
//TODO: catch only conflict
if ($row = self::getStorageById($this->storageId)) {
$this->numericId = (int)$row['numeric_id'];
} else {
Expand Down
Loading