github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

OracleDB baby steps (#4464)

Browse Source 
* Allow external connections in oracle debug

* Fix oracle overview query

* Use correct alive check for oracle

* Remove unused import

* Validate correct env vars for oracle
This commit is contained in:
Rijk van Zanten
2021-03-10 16:58:49 -05:00
committed by GitHub
parent 291643e0b4
commit 97dcdad847
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/cli/commands/bootstrap/index.ts
View File

@@ -13,7 +13,7 @@ export default async function bootstrap() {
process.exit(1);
}
const { isInstalled, default: database, schemaInspector } = require('../../../database');
const { isInstalled, default: database } = require('../../../database');
const { RolesService } = require('../../../services/roles');
const { UsersService } = require('../../../services/users');
const { SettingsService } = require('../../../services/settings');

6
api/src/database/index.ts
View File

@@ -54,7 +54,11 @@ database
export async function hasDatabaseConnection() {
try {
await database.raw('select 1 + 1 as result');
if (env.DB_CLIENT === 'oracledb') {
await database.raw('select 1 from DUAL');
} else {
await database.raw('SELECT 1');
}
return true;
} catch {
return false;

2
api/src/utils/validate-env.ts
View File

@@ -4,6 +4,8 @@ import env from '../env';
export function validateEnv(requiredKeys: string[]) {
if (env.DB_CLIENT && env.DB_CLIENT === 'sqlite3') {
requiredKeys.push('DB_FILENAME');
} else if (env.DB_CLIENT && env.DB_CLIENT === 'oracledb') {
requiredKeys.push('DB_USER', 'DB_PASSWORD', 'DB_CONNECT_STRING');
} else {
if (env.DB_CLIENT === 'pg') {
if (!env.DB_CONNECTION_STRING) {