database config in migrations.config.js

app/config/db.config.js

@@ -1,65 +1,34 @@
-const Sequelize = require('sequelize'),
-	DonorModel = require('../../models/Donor.js/index.js'),
-	GrantModel = require('../../models/Grant.js/index.js'),
-	CauseModel = require('../../models/Cause.js'),
-	RegionModel = require('../../models/Region.js/index.js'),
-	OrganizationModel = require('../../models/Organization.js/index.js'),
-	UserModel = require('../../models/User.js/index.js'),
-	PaymentPlanModel = require('../../models/paymentplan.model'),
-	ChargeModel = require('../../models/Charge'),
-	GrantsOrganizationsModel = require('../../models/Grant_Organization'),
-	associate = require('./associate');
+require('dotenv/config');
 
-const connection_uri = process.env.JAWSDB_MARIA_URL;
+module.exports = {
+	development: {
+		username: 'root',
+		password: 'water',
+		database: 'base',
+		host: 'localhost',
+		dialect: 'mysql',
 
-const sequelize = new Sequelize(connection_uri, {
-	operatorsAliases: false,
+		// default options for all models
+		define: {
+			underscored: true, // true: use underscore for automatically added attributes like timestamps below
+			timestamps: true // createdAt and updatedAt automatically added
+		},
 
-	// research for pool/connections
-	pool: {
-		max: 5,
-		min: 0,
-		acquire: 30000,
-		idle: 10000
+		// disable logging; default: console.log
+		logging: false
 	},
-
-	// default options for all models
-	define: {
-		underscored: true, // true: use underscore for automatically added attributes like timestamps below
-		freezeTableName: true, // true: table name/first parameter of define method will be table name
-		timestamps: true // createdAt and updatedAt automatically added
+	test: {
+		username: 'root',
+		password: null,
+		database: 'database_test',
+		host: '127.0.0.1',
+		dialect: 'mysql'
 	},
-
-	// disable logging; default: console.log
-	logging: false
-});
-
-const db = {};
-
-//creating tables/models from imported functions
-const Donor = DonorModel(sequelize, Sequelize);
-const Grant = GrantModel(sequelize, Sequelize);
-const Cause = CauseModel(sequelize, Sequelize);
-const Region = RegionModel(sequelize, Sequelize);
-const Organization = OrganizationModel(sequelize, Sequelize);
-const User = UserModel(sequelize, Sequelize);
-const Charge = ChargeModel(sequelize, Sequelize);
-const PaymentPlan = PaymentPlanModel(sequelize, Sequelize);
-const GrantsOrganizations = GrantsOrganizationsModel(sequelize, Sequelize);
-db.Donor = Donor;
-db.Grant = Grant;
-db.Cause = Cause;
-db.Region = Region;
-db.Organization = Organization;
-db.User = User;
-db.Charge = Charge;
-db.PaymentPlan = PaymentPlan;
-db.GrantsOrganizations = GrantsOrganizations;
-
-// make associations with created models
-associate(db);
-
-db.Sequelize = Sequelize;
-db.sequelize = sequelize;
-
-module.exports = db;
+	production: {
+		username: 'fyro63k2989tyibh',
+		password: 'ykjkyenyvxig208z',
+		database: 'n0j9gxnf4ijr7g8t',
+		host: 'am1shyeyqbxzy8gc.cbetxkdyhwsb.us-east-1.rds.amazonaws.com',
+		dialect: 'mysql'
+	}
+};

app/config/migrations.config.js

@@ -1,25 +0,0 @@
-require('dotenv/config');
-
-module.exports = {
-	development: {
-		username: 'root',
-		password: 'water',
-		database: 'base',
-		host: 'localhost',
-		dialect: 'mysql'
-	},
-	test: {
-		username: 'root',
-		password: null,
-		database: 'database_test',
-		host: '127.0.0.1',
-		dialect: 'mysql'
-	},
-	production: {
-		username: process.env.DB_USERNAME,
-		password: process.env.DB_PASSWORD,
-		database: process.env.DB_DB,
-		host: process.env.DB_HOST,
-		dialect: process.env.DB_DIALECT
-	}
-};

models/index.js

@@ -5,7 +5,7 @@ const path = require('path');
 const Sequelize = require('sequelize');
 const basename = path.basename(__filename);
 const env = process.env.NODE_ENV || 'development';
-const config = require('../app/config/migrations.config.js')[env];
+const config = require('../app/config/db.config')[env];
 const db = {};
 
 let sequelize;