Skip to content

explicitly handle version 15 and 16 and update latest version #117

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

Merged
merged 2 commits into from
Sep 11, 2024
Merged

explicitly handle version 15 and 16 and update latest version #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbbf574
explicitly handle version 15 and 16 and update latest version
bigorn0 Sep 11, 2024
09e2a99
Link model dbVersion to RE process detected database version
bigorn0 Sep 11, 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
2 changes: 1 addition & 1 deletion properties_pane/defaultData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"model": {
"modelName": "New model",
"dbVersion": "v15.x",
"dbVersion": "v16.x",
"dbVendor": "PostgreSQL"
},
"container": {
Expand Down
15 changes: 11 additions & 4 deletions reverse_engineering/helpers/postgresService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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,
});
},

Expand Down Expand Up @@ -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;
Expand All @@ -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;
},
};

Expand Down