Skip to content

Commit

Permalink
Merge 68670de into 109874a
Browse files Browse the repository at this point in the history
  • Loading branch information
Black Developa committed Apr 17, 2019
2 parents 109874a + 68670de commit 48ff3e1
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 30 deletions.
11 changes: 9 additions & 2 deletions .sequelizerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
require('@babel/register');
const isProduction = process.env.NODE_ENV === 'production';

if (!isProduction) require('@babel/register');
const path = require('path');

module.exports = {
module.exports = isProduction ? {
"config": path.resolve('./dist/config', 'db-config.js'),
"models-path": path.resolve('./dist/models'),
"seeders-path": path.resolve('./dist/seeders'),
"migrations-path": path.resolve('./dist/migrations')
} : {
"config": path.resolve('./server/config', 'db-config.js'),
"models-path": path.resolve('./server/models'),
"seeders-path": path.resolve('./server/seeders'),
Expand Down
41 changes: 30 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"test": "cross-env NODE_ENV=test npm run initdb && DEBUG=vale-ah* nyc --reporter=text --reporter=html mocha --timeout=20000 --recursive --exit",
"coverage": "nyc report --reporter=lcov --reporter=text-lcov | coveralls",
"devstart": "cross-env NODE_ENV=development npm run initdb && DEBUG=vale-ah* nodemon server/index.js --exec babel-node",
"initdb": "babel-node server/utils/initdb.js"
"initdb": "babel-node server/utils/initdb.js",
"prestart": "sequelize db:migrate"
},
"engines": {
"node": "11.x"
Expand Down
3 changes: 0 additions & 3 deletions server/migrations/20190305132457-create-user.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ module.exports = {
verified: {
type: Sequelize.BOOLEAN
},
socialProvider: {
type: Sequelize.STRING
},
image: {
type: Sequelize.STRING
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module.exports = {
up: (queryInterface, Sequelize) =>
queryInterface.changeColumn('Users', 'socialProvider', {
type: Sequelize.ENUM(['facebook', 'google', 'twitter'])
}),

down: (queryInterface, Sequelize) =>
queryInterface.changeColumn('Users', 'socialProvider', {
type: Sequelize.STRING
})
queryInterface.sequelize
.query('drop type if exists "enum_Users_socialProvider"')
.then(() =>
queryInterface.addColumn('Users', 'socialProvider', {
type: Sequelize.ENUM(['facebook', 'google', 'twitter'])
})
),
down: queryInterface => queryInterface.removeColumn('Users', 'socialProvider')
};
11 changes: 6 additions & 5 deletions server/utils/initdb.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import db from '../models';
import env from '../config/env-config';

const syncOptions = env.NODE_ENV === 'test' ? { force: true } : {};

db.sequelize.sync(syncOptions).then(() => {
db.sequelize.close();
});
if (env.NODE_ENV !== 'production') {
const syncOptions = env.NODE_ENV === 'test' ? { force: true } : {};
db.sequelize.sync(syncOptions).then(() => {
db.sequelize.close();
});
}

0 comments on commit 48ff3e1

Please sign in to comment.