Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
4 changes: 3 additions & 1 deletion agent.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';

module.exports = agent => {
require('./lib/loader')(agent);
if (agent.config.sequelize.agent) {
require('./lib/loader')(agent);
}
};
5 changes: 3 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';

module.exports = app => {
require('./lib/loader')(app);
if (app.config.sequelize.app) {
require('./lib/loader')(app);
}
};

2 changes: 2 additions & 0 deletions config/config.default.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

exports.sequelize = {
agent: true,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

文档里面加一下这两个参数

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

app: true,
dialect: 'mysql',
database: '',
host: 'localhost',
Expand Down
12 changes: 12 additions & 0 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@ interface EggSequelizeOptions extends sequelize.Options {
* `connectionUri:"mysql://localhost:3306/database"`
*/
connectionUri?: string;

/**
* Load sequelize in worker
* @default true
*/
app?: boolean;

/**
* Load sequelize in agent
* @default true
*/
agent?: boolean;
}

interface DataSources {
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/apps/connection-uri/config/config.default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ export default (appInfo: EggAppInfo) => {
config.keys = '123123';

config.sequelize = {
app: true,
agent: true,
}

return config;
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/apps/datasources-same-dir/config/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

exports.sequelize = {
app: true,
agent: true,
datasources: [
{
delegate: 'model',
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/apps/datasources/config/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

exports.sequelize = {
app: true,
agent: true,
datasources: [
{
delegate: 'model',
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/apps/model-app/config/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

exports.sequelize = {
app: true,
agent: true,
port: '3306',
host: '127.0.0.1',
username: 'root',
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/apps/sub-model/config/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

exports.sequelize = {
app: true,
agent: true,
port: '3306',
host: '127.0.0.1',
username: 'root',
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/apps/ts/config/config.default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ export default (appInfo: EggAppInfo) => {
config.keys = '123123';

config.sequelize = {
app: true,
agent: true,
datasources: [
{
delegate: 'model',
Expand Down