Skip to content

🚧 Test oracle #46304

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

Draft
nickvergessen wants to merge 13 commits into
base: dependabot/composer/doctrine/dbal-4.0.4
Choose a base branch
from
Draft

🚧 Test oracle #46304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6700249
Remove CI
nickvergessen Jul 4, 2024
0b2357f
Test oracle
nickvergessen Jul 4, 2024
d89343c
fix(CI): Test against supported Oracle versions
nickvergessen Jul 4, 2024
15bd2d7
Adjust ports
nickvergessen Jul 5, 2024
04de2cb
Use new database name
nickvergessen Jul 5, 2024
a04c3b2
fixup! Use new database name
nickvergessen Jul 5, 2024
cce5822
fixup! fixup! Use new database name
nickvergessen Jul 5, 2024
7df4bb7
debug connection
nickvergessen Jul 5, 2024
a20d9c8
fix(CI): Provide system account on installation
nickvergessen Jul 8, 2024
2257ecb
Try to workaround oracles primary key
nickvergessen Jul 9, 2024
cb8c68e
reduce CI waste
nickvergessen Jul 9, 2024
61f3289
I have no idea what I'm doing
nickvergessen Jul 9, 2024
d49ed65
fixup! I have no idea what I'm doing
nickvergessen Jul 9, 2024
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
I have no idea what I'm doing 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Jul 9, 2024
commit 61f3289a96022d1e2db671914cdaae0fc1bc100f
4 changes: 2 additions & 2 deletions lib/private/DB/AdapterOCI8.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public function fixupStatement($statement) {
$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);

$statement = preg_replace(
'/^INSERT INTO (.*) VALUES (.*) INTO (.*)$/',
'INSERT INTO ${1} VALUES ${2} RETURNING pk_id INTO ${3}',
'/^INSERT INTO (".*")( ?\(.*) ?VALUES( ?\(.*)$/',
'DECLARE vRowid ROWID; BEGIN INSERT INTO ${1} VALUES ${2} RETURNING ROWID INTO vRowid dbms_output.put_line(vRowid); END',
$statement
);

Expand Down
2 changes: 1 addition & 1 deletion lib/private/DB/OracleConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public function executeStatement($sql, array $params = [], array $types = []): i
$returned = parent::executeStatement($sql, $params, $types);

var_dump($sql);
if (preg_match('/^INSERT INTO (.*) VALUES (.*) INTO (.*)$/', $sql, $matches)) {
if (preg_match('/^DECLARE vRowid ROWID; BEGIN INSERT INTO (.*) VALUES (.*) INTO (.*)$/', $sql, $matches)) {
var_dump($returned);
$this->lastInsertId[$matches[1]] = $returned;
var_dump($this->lastInsertId);
Expand Down