不要怂,就是干,撸起袖子干!

Commit 4383922a by Ali Taheri Moghaddar Committed by Felix Becker

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

1 parent 85ee83d9
...@@ -201,7 +201,7 @@ const sequelize = new Sequelize('sqlite:relativePath/dbname.db') ...@@ -201,7 +201,7 @@ const sequelize = new Sequelize('sqlite:relativePath/dbname.db')
### PostgreSQL ### 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 ```js
const sequelize = new Sequelize('database', 'username', 'password', { const sequelize = new Sequelize('database', 'username', 'password', {
......
...@@ -153,25 +153,22 @@ class ConnectionManager extends AbstractConnectionManager { ...@@ -153,25 +153,22 @@ class ConnectionManager extends AbstractConnectionManager {
query += 'SELECT typname, oid, typarray FROM pg_type WHERE typtype = \'b\' AND typname IN (\'hstore\', \'geometry\', \'geography\')'; query += 'SELECT typname, oid, typarray FROM pg_type WHERE typtype = \'b\' AND typname IN (\'hstore\', \'geometry\', \'geography\')';
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => connection.query(query, (error, result) => error ? reject(error) : resolve(result))).then(result => {
connection.query(query) for (const row of result.rows) {
.on('error', err => reject(err)) let type;
.on('row', row => { if (row.typname === 'geometry') {
let type; type = dataTypes.postgres.GEOMETRY;
if (row.typname === 'geometry') { } else if (row.typname === 'hstore') {
type = dataTypes.postgres.GEOMETRY; type = dataTypes.postgres.HSTORE;
} else if (row.typname === 'hstore') { } else if (row.typname === 'geography') {
type = dataTypes.postgres.HSTORE; type = dataTypes.postgres.GEOGRAPHY;
} else if (row.typname === 'geography') { }
type = dataTypes.postgres.GEOGRAPHY;
}
type.types.postgres.oids.push(row.oid); type.types.postgres.oids.push(row.oid);
type.types.postgres.array_oids.push(row.typarray); type.types.postgres.array_oids.push(row.typarray);
this._refreshTypeParser(type); this._refreshTypeParser(type);
}) }
.on('end', () => resolve());
}); });
}); });
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!