Merge branch 'postgresql'

3 files changed, 20 insertions, 17 deletions

diff --git a/scripts/danger/clean/cleaner.js b/scripts/danger/clean/cleaner.js
index 10e91e700..1a1e3dee7 100644
--- a/scripts/danger/clean/cleaner.js
+++ b/scripts/danger/clean/cleaner.js
@@ -1,24 +1,25 @@
+const eachSeries = require('async/eachSeries')
 const rimraf = require('rimraf')
-const mongoose = require('mongoose')
-mongoose.Promise = global.Promise
 
 const constants = require('../../../server/initializers/constants')
+const db = require('../../../server/initializers/database')
 
-const mongodbUrl = 'mongodb://' + constants.CONFIG.DATABASE.HOSTNAME + ':' + constants.CONFIG.DATABASE.PORT + '/' + constants.CONFIG.DATABASE.DBNAME
-mongoose.connect(mongodbUrl, function () {
-  console.info('Deleting MongoDB %s database.', constants.CONFIG.DATABASE.DBNAME)
-  mongoose.connection.dropDatabase(function () {
-    mongoose.connection.close()
-  })
-})
+db.init(true, function () {
+  db.sequelize.drop().asCallback(function (err) {
+    if (err) throw err
 
-const STORAGE = constants.CONFIG.STORAGE
-Object.keys(STORAGE).forEach(function (storage) {
-  const storageDir = STORAGE[storage]
+    console.info('Tables of %s deleted.', db.sequelize.config.database)
 
-  rimraf(storageDir, function (err) {
-    if (err) throw err
+    const STORAGE = constants.CONFIG.STORAGE
+    eachSeries(Object.keys(STORAGE), function (storage, callbackEach) {
+      const storageDir = STORAGE[storage]
 
-    console.info('Deleting %s.', storageDir)
+      rimraf(storageDir, function (err) {
+        console.info('%s deleted.', storageDir)
+        return callbackEach(err)
+      })
+    }, function () {
+      process.exit(0)
+    })
   })
 })
diff --git a/scripts/danger/clean/dev.sh b/scripts/danger/clean/dev.sh
index 5f09565cf..f4a5d1e8a 100755
--- a/scripts/danger/clean/dev.sh
+++ b/scripts/danger/clean/dev.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-read -p "This will remove all directories and Mongo database. Are you sure? " -n 1 -r
+read -p "This will remove all directories and SQL tables. Are you sure? (y/*) " -n 1 -r
+echo
 
 if [[ "$REPLY" =~ ^[Yy]$ ]]; then
   NODE_ENV=test node "./scripts/danger/clean/cleaner"
diff --git a/scripts/danger/clean/prod.sh b/scripts/danger/clean/prod.sh
index e6c92671d..7ee13ba83 100755
--- a/scripts/danger/clean/prod.sh
+++ b/scripts/danger/clean/prod.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-read -p "This will remove all directories and Mongo database. Are you sure? " -n 1 -r
+read -p "This will remove all directories and SQL tables. Are you sure? (y/*) " -n 1 -r
+echo
 
 if [[ "$REPLY" =~ ^[Yy]$ ]]; then
   NODE_ENV=production node "./scripts/danger/clean/cleaner"