diff --git a/properties_pane/defaultData.json b/properties_pane/defaultData.json index f7aec11..853d866 100644 --- a/properties_pane/defaultData.json +++ b/properties_pane/defaultData.json @@ -1,7 +1,7 @@ { "model": { "modelName": "New model", - "dbVersion": "v15.x", + "dbVersion": "v16.x", "dbVendor": "PostgreSQL" }, "container": { diff --git a/reverse_engineering/helpers/postgresService.js b/reverse_engineering/helpers/postgresService.js index c98f580..526834c 100644 --- a/reverse_engineering/helpers/postgresService.js +++ b/reverse_engineering/helpers/postgresService.js @@ -51,7 +51,7 @@ const { mapSequenceData } = require('./postgresHelpers/sequenceHelper'); let useSshTunnel = false; let _ = null; let logger = null; -let version = 14; +let version = 16; module.exports = { setDependencies(app) { @@ -102,9 +102,9 @@ module.exports = { async logVersion() { const versionRow = await db.queryTolerant(queryConstants.GET_VERSION, [], true); - const version = versionRow?.version || 'Version not retrieved'; + const serverVersion = versionRow?.version || 'Version not retrieved'; - logger.info(`PostgreSQL version: ${version}`); + logger.info(`PostgreSQL version: ${serverVersion}`); }, async getAllSchemasNames() { @@ -135,12 +135,14 @@ module.exports = { const database_name = (await db.queryTolerant(queryConstants.GET_DB_NAME, [], true))?.current_database; const encoding = (await db.queryTolerant(queryConstants.GET_DB_ENCODING, [], true))?.server_encoding; const LC_COLLATE = (await db.queryTolerant(queryConstants.GET_DB_COLLATE_NAME, [], true))?.default_collate_name; + const dbVersion = `v${await this._getServerVersion()}.x`; return clearEmptyPropertiesInObject({ database_name, encoding, LC_COLLATE, LC_CTYPE: LC_COLLATE, + dbVersion, }); }, @@ -441,6 +443,7 @@ module.exports = { async _getServerVersion() { const result = await db.queryTolerant(queryConstants.GET_VERSION_AS_NUM, [], true); const serverVersionNum = _.toNumber(result?.server_version_num); + const latestPgVersion = 16; if (serverVersionNum >= 100000 && serverVersionNum < 110000) { return 10; @@ -452,9 +455,13 @@ module.exports = { return 13; } else if (serverVersionNum >= 140000 && serverVersionNum < 150000) { return 14; + } else if (serverVersionNum >= 150000 && serverVersionNum < 160000) { + return 15; + } else if (serverVersionNum >= 160000 && serverVersionNum < 170000) { + return 16; } - return 14; + return latestPgVersion; }, };