diff --git a/spec/features.spec.js b/spec/features.spec.js index ec23afe2..23b43c0b 100644 --- a/spec/features.spec.js +++ b/spec/features.spec.js @@ -17,8 +17,6 @@ describe('features', () => { expect(data).toBeDefined(); expect(data.features).toBeDefined(); expect(data.parseServerVersion).toBeDefined(); - expect(data.database).toBeDefined(); - expect(['MongoDB', 'PostgreSQL']).toContain(data.database.engine); }); it('requires the master key to get features', async done => { diff --git a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js index d8ecc3c6..a289ccee 100644 --- a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js +++ b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js @@ -126,8 +126,6 @@ export class MongoStorageAdapter implements StorageAdapter { client: MongoClient; _maxTimeMS: ?number; canSortOnJoinTables: boolean; - databaseVersion: string; - engine: string; constructor({ uri = defaults.DefaultMongoURI, @@ -138,7 +136,6 @@ export class MongoStorageAdapter implements StorageAdapter { this._collectionPrefix = collectionPrefix; this._mongoOptions = mongoOptions; this._mongoOptions.useNewUrlParser = true; - this.engine = 'MongoDB'; // MaxTimeMS is not a global MongoDB client option, it is applied per operation. this._maxTimeMS = mongoOptions.maxTimeMS; @@ -962,15 +959,7 @@ export class MongoStorageAdapter implements StorageAdapter { } performInitialization(): Promise { - // databaseVersion - return this.connect() - .then(() => { - const adminDb = this.database.admin(); - return adminDb.serverStatus(); - }) - .then(status => { - this.databaseVersion = status.version; - }); + return Promise.resolve(); } createIndex(className: string, index: any) { diff --git a/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js b/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js index ef7faead..5ba3a005 100644 --- a/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js +++ b/src/Adapters/Storage/Postgres/PostgresStorageAdapter.js @@ -778,8 +778,6 @@ const buildWhereClause = ({ schema, query, index }): WhereClause => { export class PostgresStorageAdapter implements StorageAdapter { canSortOnJoinTables: boolean; - databaseVersion: string; - engine: string; // Private _collectionPrefix: string; @@ -792,7 +790,6 @@ export class PostgresStorageAdapter implements StorageAdapter { this._client = client; this._pgp = pgp; this.canSortOnJoinTables = false; - this.engine = 'PostgreSQL'; } handleShutdown() { @@ -2279,12 +2276,6 @@ export class PostgresStorageAdapter implements StorageAdapter { }) .then(data => { debug(`initializationDone in ${data.duration}`); - // databaseVersion - return this._client.query('SHOW server_version'); - }) - .then(versionData => { - // versionData is like [ { server_version: '11.3' } ] - this.databaseVersion = versionData[0].server_version; }) .catch(error => { /* eslint-disable no-console */ diff --git a/src/Adapters/Storage/StorageAdapter.js b/src/Adapters/Storage/StorageAdapter.js index b1ba9891..31afe569 100644 --- a/src/Adapters/Storage/StorageAdapter.js +++ b/src/Adapters/Storage/StorageAdapter.js @@ -25,8 +25,6 @@ export type FullQueryOptions = QueryOptions & UpdateQueryOptions; export interface StorageAdapter { canSortOnJoinTables: boolean; - databaseVersion: string; - engine: string; classExists(className: string): Promise; setClassLevelPermissions(className: string, clps: any): Promise; diff --git a/src/Routers/FeaturesRouter.js b/src/Routers/FeaturesRouter.js index 443c142b..c0cc56d7 100644 --- a/src/Routers/FeaturesRouter.js +++ b/src/Routers/FeaturesRouter.js @@ -52,15 +52,10 @@ export class FeaturesRouter extends PromiseRouter { }, }; - const dbAdapter = config.database.adapter; return { response: { features: features, parseServerVersion: version, - database: { - engine: dbAdapter.engine, - version: dbAdapter.databaseVersion, - }, }, }; }