diff --git a/forward_engineering/ddlProvider/templates.js b/forward_engineering/ddlProvider/templates.js index becf1ea..a965e95 100644 --- a/forward_engineering/ddlProvider/templates.js +++ b/forward_engineering/ddlProvider/templates.js @@ -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', diff --git a/package-lock.json b/package-lock.json index 6171c3c..346844b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "PostgreSQL", - "version": "0.2.8", + "version": "0.2.18", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "PostgreSQL", - "version": "0.2.8", + "version": "0.2.18", "dependencies": { "lodash": "4.17.21", "pg": "8.12.0" @@ -29,7 +29,7 @@ "simple-git-hooks": "2.11.1" }, "engines": { - "hackolade": "6.1.2", + "hackolade": "7.7.10", "hackoladePlugin": "1.2.0" } }, diff --git a/package.json b/package.json index 288713c..f4dd9c8 100644 --- a/package.json +++ b/package.json @@ -88,4 +88,4 @@ "lodash": "4.17.21", "pg": "8.12.0" } -} \ No newline at end of file +} diff --git a/polyglot/convertAdapter.json b/polyglot/convertAdapter.json index 101656e..09a1b19 100644 --- a/polyglot/convertAdapter.json +++ b/polyglot/convertAdapter.json @@ -47,8 +47,7 @@ "type": "vector" }, "to": { - "to": "vector", - "subtype": "" + "subtype": "vector" } } ] diff --git a/reverse_engineering/helpers/connectionHelper.js b/reverse_engineering/helpers/connectionHelper.js index 35e69d1..7c7c6c4 100644 --- a/reverse_engineering/helpers/connectionHelper.js +++ b/reverse_engineering/helpers/connectionHelper.js @@ -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 = {