import fs from 'fs';
import path from 'path';
import Sequelize from 'sequelize';
import dotenv from 'dotenv';
import dbConfig from '../config/config';

const basename = path.basename(module.filename);
const env = process.env.NODE_ENV || 'development';
const config = dbConfig[env];
const db = {};
dotenv.config();
let sequelize;
if (config.use_env_variable) {
  sequelize = new Sequelize(process.env.DATABASE_URL);
} else {
  sequelize = new Sequelize(config.database, config.username, config.password, config);
}

fs
  .readdirSync(__dirname)
  .filter(file =>
    (file.indexOf('.') !== 0) &&
    (file !== basename) &&
    (file.slice(-3) === '.js')).forEach((file) => {
    const model = sequelize.import(path.join(__dirname, file));
    db[model.name] = model;
  });

Object.keys(db).forEach((modelName) => {
  if (db[modelName].associate) {
    db[modelName].associate(db);
  }
});

db.sequelize = sequelize;
db.Sequelize = Sequelize;

export default db;

@@ -326,35 +326,136 @@
 ze;%0A
+%0A
 if (
-config.use_env_variable
+process.env.DATABASE_URL) %7B%0A  sequelize = new Sequelize(process.env.DATABASE_URL);%0A%7D else if (process.env.DATABASE_TEST_URL
 ) %7B%0A
@@ -495,32 +495,37 @@
 ss.env.DATABASE_
+TEST_
 URL);%0A%7D else %7B%0A 

Fix issue with travis configuration