Skip to content

[NO JIRA] Bug fixes #346

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
declare(strict_types=1);

namespace ApiSource\Controller;
namespace ApiConnector\Controller;

use App\Controller\AppController as BaseController;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
declare(strict_types=1);

namespace FileProvisioner\Controller;
namespace FileConnector\Controller;

use App\Controller\AppController as BaseController;

Expand Down
2 changes: 1 addition & 1 deletion app/config/schema/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@
"columns": {
"id": {},
"job_id": { "type": "integer", "foreignkey": { "table": "jobs", "column": "id" }},
"record_key": { "type": "string", "size": 64 },
"record_key": { "type": "string", "size": 512 },
"person_id": {},
"external_identity_id": {},
"comment": {},
Expand Down
2 changes: 1 addition & 1 deletion app/plugins/CoreServer/config/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"refresh_token": { "type": "text" },
"access_token": { "type": "text" },
"token_response": { "type": "text" },
"access_token_exp": { "type": "boolean" }
"access_token_exp": { "type": "bigint"}
},
"indexes": {
"oauth2_servers_i1": { "columns": [ "server_id" ] }
Expand Down
2 changes: 1 addition & 1 deletion app/plugins/CoreServer/src/CoreServerPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function bootstrap(PluginApplicationInterface $app): void
$oracleEnabled = \Cake\Core\Configure::read('registry.database.oracle.enable');

if($oracleEnabled === true) {
$app->addPlugin(\CakeDC\OracleDriver\Plugin::class, ['bootstrap' => true]);
$app->addPlugin(\Ioigoume\OracleDriver\Plugin::class, ['bootstrap' => true]);
}
}
catch(\Error $e) {
Expand Down
6 changes: 3 additions & 3 deletions app/plugins/CoreServer/src/Model/Table/SqlServersTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ public function connect(int $serverId, string $name): bool {
// We don't test that the plugin is available here, an error should be thrown
// when we try to connect.

$dbconfig['className'] = 'CakeDC\OracleDriver\Database\OracleConnection';
$dbconfig['driver'] = 'CakeDC\OracleDriver\Database\Driver\OracleOCI'; // For OCI8
$dbconfig['className'] = 'Ioigoume\OracleDriver\Database\OracleConnection';
$dbconfig['driver'] = 'Ioigoume\OracleDriver\Database\Driver\OracleOCI'; // For OCI8
$dbconfig['quoteIdentifiers'] = true;

// Use 'CakeDC\\OracleDriver\\Database\\Driver\\OraclePDO' for PDO_OCI, but CakeDC
Expand All @@ -177,7 +177,7 @@ public function connect(int $serverId, string $name): bool {
// correctly enables the long alias support, to we hard code that version to simplify
// configuration. Note Oracle changed their release numbers to be based on calendar years,
// retroactively assigning 18c (12.2.0.2) and 19c (12.2.0.3), so this approach should
// work at least for those versions.
// work at least for those versions.
$dbconfig['server_version'] = 19;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/Model/Table/PetitionsTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public function initialize(array $config): void {
'type' => 'enum',
'class' => 'PetitionStatusEnum'
],
'couIds' => [
'cous' => [
'type' => 'select',
'model' => 'Cous'
]
Expand Down