Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-10-09 20:58:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

[iso-core]: Update api for loadModels

Browse source
This commit is contained in:
Juan Tejada 2016-11-23 11:49:10 -08:00
parent edd49c0f4a
commit f2a032c87c
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/isomorphic-core/src/models/index.js
View file

@ -1,12 +1,12 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
function loadModels(Sequelize, sequelize, modelsPath, {schema} = {}) { function loadModels(Sequelize, sequelize, {modelsDir = __dirname, modelsSubPath = '', schema} = {}) {
const db = {}; const db = {};
const modelsDirectory = path.join(__dirname, modelsPath) const fullModelsDir = path.join(modelsDir, modelsSubPath)
for (const filename of fs.readdirSync(modelsDirectory)) { for (const filename of fs.readdirSync(fullModelsDir)) {
if (filename.endsWith('.js')) { if (filename.endsWith('.js')) {
let model = sequelize.import(path.join(modelsDirectory, filename)); let model = sequelize.import(path.join(fullModelsDir, filename));
if (schema) { if (schema) {
model = model.schema(schema); model = model.schema(schema);
} }

7
packages/local-sync/src/shared/local-database-connector.js
View file

@ -36,7 +36,10 @@ class LocalDatabaseConnector {
} }
const newSequelize = this._sequelizePoolForDatabase(`a-${accountId}`); const newSequelize = this._sequelizePoolForDatabase(`a-${accountId}`);
const db = loadModels(Sequelize, newSequelize, 'account', {schema: `a${accountId}`}) const db = loadModels(Sequelize, newSequelize, {
modelsSubPath: 'account',
schema: `a${accountId}`,
})
HookTransactionLog(db, newSequelize); HookTransactionLog(db, newSequelize);
HookIncrementVersionOnSave(db, newSequelize); HookIncrementVersionOnSave(db, newSequelize);
@ -69,7 +72,7 @@ class LocalDatabaseConnector {
_sequelizeForShared() { _sequelizeForShared() {
const sequelize = this._sequelizePoolForDatabase(`shared`); const sequelize = this._sequelizePoolForDatabase(`shared`);
const db = loadModels(Sequelize, sequelize, 'shared') const db = loadModels(Sequelize, sequelize, {modelsSubPath: 'shared'})
HookAccountCRUD(db, sequelize); HookAccountCRUD(db, sequelize);