Skip to content
Open
Changes from 7 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
8 changes: 8 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@ module.exports = sails => {
return next(err);
}

// if exist any implementation of sails hook contain model definitions,
// then merge sails hook's model before init all models.
if (sails.models) {
const merge = sails.util ? sails.util.merge : _.merge;
const hookModels = sails.models || {};
Copy link
Owner

Choose a reason for hiding this comment

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

Seems that you already checked sails.models in if statement above :)

models = merge({}, models, hookModels);
}

self.defineModels(models, connections);
self.migrateSchema(next, connections, models);
});
Expand Down