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

Commit e8d2336f by Jan Aagaard Meier

[ci skip] Remove obsolete queue and maxCo..queries options. Closes #2405

1 parent a58acecd
...@@ -59,8 +59,6 @@ var sequelize = new Sequelize('mysql://localhost:3306/database', {}) ...@@ -59,8 +59,6 @@ var sequelize = new Sequelize('mysql://localhost:3306/database', {})
| [options.timezone='+00:00'] | String | The timezone used when converting a date from the database into a javascript date. The timezone is also used to SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP and other time related functions have in the right timezone. For best cross platform performance use the format +/-HH:MM. | | [options.timezone='+00:00'] | String | The timezone used when converting a date from the database into a javascript date. The timezone is also used to SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP and other time related functions have in the right timezone. For best cross platform performance use the format +/-HH:MM. |
| [options.logging=console.log] | Function | A function that gets executed everytime Sequelize would log something. | | [options.logging=console.log] | Function | A function that gets executed everytime Sequelize would log something. |
| [options.omitNull=false] | Boolean | A flag that defines if null values should be passed to SQL queries or not. | | [options.omitNull=false] | Boolean | A flag that defines if null values should be passed to SQL queries or not. |
| [options.queue=true] | Boolean | Queue queries, so that only maxConcurrentQueries number of queries are executing at once. If false, all queries will be executed immediately. |
| [options.maxConcurrentQueries=50] | Integer | The maximum number of queries that should be executed at once if queue is true. |
| [options.native=false] | Boolean | A flag that defines if native library shall be used or not. Currently only has an effect for postgres | | [options.native=false] | Boolean | A flag that defines if native library shall be used or not. Currently only has an effect for postgres |
| [options.replication=false] | Boolean | Use read / write replication. To enable replication, pass an object, with two properties, read and write. Write should be an object (a single server for handling writes), and read an array of object (several servers to handle reads). Each read/write server can have the following properties: `host`, `port`, `username`, `password`, `database` | | [options.replication=false] | Boolean | Use read / write replication. To enable replication, pass an object, with two properties, read and write. Write should be an object (a single server for handling writes), and read an array of object (several servers to handle reads). Each read/write server can have the following properties: `host`, `port`, `username`, `password`, `database` |
| [options.pool={}] | Object | Should sequelize use a connection pool. Default is true | | [options.pool={}] | Object | Should sequelize use a connection pool. Default is true |
......
...@@ -51,9 +51,6 @@ var sequelize = new Sequelize('database', 'username', 'password', { ...@@ -51,9 +51,6 @@ var sequelize = new Sequelize('database', 'username', 'password', {
// disable logging; default: console.log // disable logging; default: console.log
logging: false, logging: false,
   
// max concurrent database requests; default: 50
maxConcurrentQueries: 100,
 
// the sql dialect of the database // the sql dialect of the database
// - default is 'mysql' // - default is 'mysql'
// - currently supported: 'mysql', 'sqlite', 'postgres', 'mariadb', 'mssql' // - currently supported: 'mysql', 'sqlite', 'postgres', 'mariadb', 'mssql'
......
...@@ -76,8 +76,6 @@ module.exports = (function() { ...@@ -76,8 +76,6 @@ module.exports = (function() {
* @param {String} [options.timezone='+00:00'] The timezone used when converting a date from the database into a javascript date. The timezone is also used to SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP and other time related functions have in the right timezone. For best cross platform performance use the format +/-HH:MM. * @param {String} [options.timezone='+00:00'] The timezone used when converting a date from the database into a javascript date. The timezone is also used to SET TIMEZONE when connecting to the server, to ensure that the result of NOW, CURRENT_TIMESTAMP and other time related functions have in the right timezone. For best cross platform performance use the format +/-HH:MM.
* @param {Function} [options.logging=console.log] A function that gets executed everytime Sequelize would log something. * @param {Function} [options.logging=console.log] A function that gets executed everytime Sequelize would log something.
* @param {Boolean} [options.omitNull=false] A flag that defines if null values should be passed to SQL queries or not. * @param {Boolean} [options.omitNull=false] A flag that defines if null values should be passed to SQL queries or not.
* @param {Boolean} [options.queue=true] Queue queries, so that only maxConcurrentQueries number of queries are executing at once. If false, all queries will be executed immediately.
* @param {Integer} [options.maxConcurrentQueries=50] The maximum number of queries that should be executed at once if queue is true.
* @param {Boolean} [options.native=false] A flag that defines if native library shall be used or not. Currently only has an effect for postgres * @param {Boolean} [options.native=false] A flag that defines if native library shall be used or not. Currently only has an effect for postgres
* @param {Boolean} [options.replication=false] Use read / write replication. To enable replication, pass an object, with two properties, read and write. Write should be an object (a single server for handling writes), and read an array of object (several servers to handle reads). Each read/write server can have the following properties: `host`, `port`, `username`, `password`, `database` * @param {Boolean} [options.replication=false] Use read / write replication. To enable replication, pass an object, with two properties, read and write. Write should be an object (a single server for handling writes), and read an array of object (several servers to handle reads). Each read/write server can have the following properties: `host`, `port`, `username`, `password`, `database`
* @param {Object} [options.pool={}] Should sequelize use a connection pool. Default is true * @param {Object} [options.pool={}] Should sequelize use a connection pool. Default is true
...@@ -174,12 +172,10 @@ module.exports = (function() { ...@@ -174,12 +172,10 @@ module.exports = (function() {
port: this.options.port, port: this.options.port,
pool: this.options.pool, pool: this.options.pool,
protocol: this.options.protocol, protocol: this.options.protocol,
queue: this.options.queue,
native: this.options.native, native: this.options.native,
ssl: this.options.ssl, ssl: this.options.ssl,
replication: this.options.replication, replication: this.options.replication,
dialectModulePath: this.options.dialectModulePath, dialectModulePath: this.options.dialectModulePath,
maxConcurrentQueries: this.options.maxConcurrentQueries,
keepDefaultTimezone: this.options.keepDefaultTimezone, keepDefaultTimezone: this.options.keepDefaultTimezone,
dialectOptions: this.options.dialectOptions dialectOptions: this.options.dialectOptions
}; };
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!