Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit 4383922a by Ali Taheri Moghaddar Committed by Felix Becker
Options

feat(dependency): Support pg version 7 (#7888)

1 parent 85ee83d9
Inline Side-by-side
Showing with 56 additions and 71 deletions
docs/usage.md
......@@ -201,7 +201,7 @@ const sequelize = new Sequelize('sqlite:relativePath/dbname.db')
### PostgreSQL
The library for PostgreSQL is`pg@~3.6.0` You'll just need to define the dialect:
The library for PostgreSQL is`pg@^5.0.0 || ^6.0.0 || ^7.0.0` You'll just need to define the dialect:
```js
const sequelize = new Sequelize('database', 'username', 'password', {
......
lib/dialects/postgres/connection-manager.js
......@@ -153,10 +153,8 @@ class ConnectionManager extends AbstractConnectionManager {
query += 'SELECT typname, oid, typarray FROM pg_type WHERE typtype = \'b\' AND typname IN (\'hstore\', \'geometry\', \'geography\')';
}
return new Promise((resolve, reject) => {
connection.query(query)
.on('error', err => reject(err))
.on('row', row => {
return new Promise((resolve, reject) => connection.query(query, (error, result) => error ? reject(error) : resolve(result))).then(result => {
for (const row of result.rows) {
let type;
if (row.typname === 'geometry') {
type = dataTypes.postgres.GEOMETRY;
......@@ -170,8 +168,7 @@ class ConnectionManager extends AbstractConnectionManager {
type.types.postgres.array_oids.push(row.typarray);
this._refreshTypeParser(type);
})
.on('end', () => resolve());
}
});
});
}
......
lib/dialects/postgres/query.js
......@@ -60,9 +60,9 @@ class Query extends AbstractQuery {
this.sql = this.sequelize.queryInterface.QueryGenerator.setSearchPath(this.options.searchPath) + sql;
}
const query = parameters && parameters.length ? this.client.query(this.sql, parameters) : this.client.query(this.sql);
const rows = [];
let receivedError = false;
const query = parameters && parameters.length
? new Promise((resolve, reject) => this.client.query(this.sql, parameters, (error, result) => error ? reject(error) : resolve(result)))
: new Promise((resolve, reject) => this.client.query(this.sql, (error, result) => error ? reject(error) : resolve(result)));
//do we need benchmark for this query execution
const benchmark = this.sequelize.options.benchmark || this.options.benchmark;
......@@ -76,39 +76,27 @@ class Query extends AbstractQuery {
debug(`executing(${this.client.uuid || 'default'}) : ${this.sql}`);
return new Promise((resolve, reject) => {
query.on('row', row => {
rows.push(row);
});
query.on('error', err => {
return query.catch(err => {
// set the client so that it will be reaped if the connection resets while executing
if (err.code === 'ECONNRESET') {
this.client._invalid = true;
}
receivedError = true;
err.sql = sql;
reject(this.formatError(err));
});
query.on('end', result => {
throw this.formatError(err);
})
.then(queryResult => {
debug(`executed(${this.client.uuid || 'default'}) : ${this.sql}`);
if (benchmark) {
this.sequelize.log('Executed (' + (this.client.uuid || 'default') + '): ' + this.sql, Date.now() - queryBegin, this.options);
}
if (receivedError) {
return;
}
resolve([rows, sql, result]);
});
}).spread((rows, sql, result) => {
const results = rows;
return queryResult;
})
.then(queryResult => {
const rows = queryResult.rows;
const rowCount = queryResult.rowCount;
const isTableNameQuery = sql.indexOf('SELECT table_name FROM information_schema.tables') === 0;
const isRelNameQuery = sql.indexOf('SELECT relname FROM pg_class WHERE oid IN') === 0;
......@@ -128,30 +116,29 @@ class Query extends AbstractQuery {
detail: rows[0].sequelize_caught_exception
});
} else {
rows = rows.map(row => {
for (const row of rows) {
delete row.sequelize_caught_exception;
return row;
});
}
}
}
if (this.isShowIndexesQuery()) {
for (const result of results) {
const attributes = /ON .*? (?:USING .*?\s)?\(([^]*)\)/gi.exec(result.definition)[1].split(',');
for (const row of rows) {
const attributes = /ON .*? (?:USING .*?\s)?\(([^]*)\)/gi.exec(row.definition)[1].split(',');
// Map column index in table to column name
const columns = _.zipObject(
result.column_indexes,
this.sequelize.queryInterface.QueryGenerator.fromArray(result.column_names)
row.column_indexes,
this.sequelize.queryInterface.QueryGenerator.fromArray(row.column_names)
);
delete result.column_indexes;
delete result.column_names;
delete row.column_indexes;
delete row.column_names;
let field;
let attribute;
// Indkey is the order of attributes in the index, specified by a string of attribute indexes
result.fields = result.indkey.split(' ').map((indKey, index) => {
row.fields = row.indkey.split(' ').map((indKey, index) => {
field = columns[indKey];
// for functional indices indKey = 0
if (!field) {
......@@ -165,11 +152,11 @@ class Query extends AbstractQuery {
length: undefined
};
}).filter(n => n !== null);
delete result.columns;
delete row.columns;
}
return results;
return rows;
} else if (this.isForeignKeysQuery()) {
result = [];
const result = [];
for (const row of rows) {
let defParts;
if (row.condef !== undefined && (defParts = row.condef.match(/FOREIGN KEY \((.+)\) REFERENCES (.+)\((.+)\)( ON (UPDATE|DELETE) (CASCADE|RESTRICT))?( ON (UPDATE|DELETE) (CASCADE|RESTRICT))?/))) {
......@@ -188,6 +175,7 @@ class Query extends AbstractQuery {
}
return result;
} else if (this.isSelectQuery()) {
let result = rows;
// Postgres will treat tables as case-insensitive, so fix the case
// of the returned values to match attributes
if (this.options.raw === false && this.sequelize.options.quoteIdentifiers === false) {
......@@ -195,7 +183,7 @@ class Query extends AbstractQuery {
m[k.toLowerCase()] = k;
return m;
}, {});
rows = _.map(rows, row=> {
result = _.map(rows, row=> {
return _.mapKeys(row, (value, key)=> {
const targetAttr = attrsMap[key];
if (typeof targetAttr === 'string' && targetAttr !== key) {
......@@ -206,34 +194,34 @@ class Query extends AbstractQuery {
});
});
}
return this.handleSelectQuery(rows);
return this.handleSelectQuery(result);
} else if (QueryTypes.DESCRIBE === this.options.type) {
result = {};
for (const _result of rows) {
result[_result.Field] = {
type: _result.Type.toUpperCase(),
allowNull: _result.Null === 'YES',
defaultValue: _result.Default,
special: _result.special ? this.sequelize.queryInterface.QueryGenerator.fromArray(_result.special) : [],
primaryKey: _result.Constraint === 'PRIMARY KEY'
const result = {};
for (const row of rows) {
result[row.Field] = {
type: row.Type.toUpperCase(),
allowNull: row.Null === 'YES',
defaultValue: row.Default,
special: row.special ? this.sequelize.queryInterface.QueryGenerator.fromArray(row.special) : [],
primaryKey: row.Constraint === 'PRIMARY KEY'
};
if (result[_result.Field].type === 'BOOLEAN') {
result[_result.Field].defaultValue = { 'false': false, 'true': true }[result[_result.Field].defaultValue];
if (result[row.Field].type === 'BOOLEAN') {
result[row.Field].defaultValue = { 'false': false, 'true': true }[result[row.Field].defaultValue];
if (result[_result.Field].defaultValue === undefined) {
result[_result.Field].defaultValue = null;
if (result[row.Field].defaultValue === undefined) {
result[row.Field].defaultValue = null;
}
}
if (typeof result[_result.Field].defaultValue === 'string') {
result[_result.Field].defaultValue = result[_result.Field].defaultValue.replace(/'/g, '');
if (typeof result[row.Field].defaultValue === 'string') {
result[row.Field].defaultValue = result[row.Field].defaultValue.replace(/'/g, '');
if (result[_result.Field].defaultValue.indexOf('::') > -1) {
const split = result[_result.Field].defaultValue.split('::');
if (result[row.Field].defaultValue.indexOf('::') > -1) {
const split = result[row.Field].defaultValue.split('::');
if (split[1].toLowerCase() !== 'regclass)') {
result[_result.Field].defaultValue = split[0];
result[row.Field].defaultValue = split[0];
}
}
}
......@@ -241,17 +229,17 @@ class Query extends AbstractQuery {
return result;
} else if (this.isVersionQuery()) {
return results[0].server_version;
return rows[0].server_version;
} else if (this.isShowOrDescribeQuery()) {
return results;
return rows;
} else if (QueryTypes.BULKUPDATE === this.options.type) {
if (!this.options.returning) {
return parseInt(result.rowCount, 10);
return parseInt(rowCount, 10);
}
return this.handleSelectQuery(rows);
} else if (QueryTypes.BULKDELETE === this.options.type) {
return parseInt(result.rowCount, 10);
return parseInt(rowCount, 10);
} else if (this.isUpsertQuery()) {
return rows[0].sequelize_upsert;
} else if (this.isInsertQuery() || this.isUpdateQuery()) {
......@@ -269,12 +257,12 @@ class Query extends AbstractQuery {
return [
this.instance || rows && (this.options.plain && rows[0] || rows) || undefined,
result.rowCount
rowCount
];
} else if (this.isRawQuery()) {
return [rows, result];
return [rows, queryResult];
} else {
return results;
return rows;
}
});
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!