Skip to content

HCK-9149: postgres -> polyglot mapping #133

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
Dec 20, 2024
Merged

HCK-9149: postgres -> polyglot mapping #133

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
c6b0eb1
fix: convert vectors into `vector<real` for "to polyglot"
chulanovskyi-bs Dec 20, 2024
7c3f3dc
fix: allow vector types to be used in custom schemas
chulanovskyi-bs Dec 20, 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 forward_engineering/ddlProvider/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
createDatabase:
'CREATE DATABASE ${name}${template}${encoding}${locale}${collate}${characterClassification}${tablespace};\n',

createSchema: 'CREATE SCHEMA${ifNotExist} ${name};\nSET search_path TO ${name};\n\n${comment}\n',
createSchema: 'CREATE SCHEMA${ifNotExist} ${name};\nSET search_path TO ${name}, public;\n\n${comment}\n',

comment: 'COMMENT ON ${object} ${objectName} IS ${comment};\n',

Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@
"lodash": "4.17.21",
"pg": "8.12.0"
}
}
}
3 changes: 1 addition & 2 deletions polyglot/convertAdapter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
"type": "vector"
},
"to": {
"to": "vector",
"subtype": ""
"subtype": "vector<real>"
}
}
]
Expand Down
27 changes: 13 additions & 14 deletions reverse_engineering/helpers/connectionHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,25 +135,24 @@ const retryOnSslError = (config, logger, error) => {
throw error;
};

const createConnectionPool = (config, logger) => {
const createConnectionPool = async (config, logger) => {
const pool = new pg.Pool(config);

return pool
.connect()
.then(client => {
client.release();
try {
const client = await pool.connect();

return pool;
})
.catch(async error => {
await pool.end();
client.release();

if (config.isRetry) {
throw error;
}
return pool;
} catch (error) {
await pool.end();

return retryOnSslError(config, logger, error);
});
if (config.isRetry) {
throw error;
}

return retryOnSslError(config, logger, error);
}
};

module.exports = {
Expand Down
Loading