Merge pull request keithwhor#302 from jasondecamp/migrationFixHiddenF…

…iles fix migrations to ignore hidden files in the migrations directory
ranchodeluxe · Nov 2, 2016 · 46d53ef · 46d53ef
2 parents c28ee94 + ac390ba
commit 46d53ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/core/my/bootstrapper.js b/core/my/bootstrapper.js
@@ -172,14 +172,13 @@ class Bootstrapper {
           let schema_ids = result.rows.map((v) => { return v.id; });
 
           let migrations = fs.readdirSync(MIGRATION_PATH).map((v) => {
+            if(v.indexOf('.') === 0) return {};
             return {
               id: parseInt(v.substr(0, v.indexOf('__'))),
               migration: new (require(process.cwd() + '/' + MIGRATION_PATH + '/' + v))(db)
             };
-          });
-
-          migrations = migrations.filter((v) => {
-            return schema_ids.indexOf(v.id) === -1;
+          }).filter((v) => {
+            return v.id && schema_ids.indexOf(v.id) === -1;
           });
 
           if (migrations.length === 0) {
@@ -245,12 +244,13 @@ class Bootstrapper {
         let schema_ids = result.rows.map((v) => { return v.id; });
 
         let migrations = fs.readdirSync(MIGRATION_PATH).map((v) => {
+          if(v.indexOf('.') === 0) return {};
           return {
             id: parseInt(v.substr(0, v.indexOf('__'))),
             migration: new (require(process.cwd() + '/' + MIGRATION_PATH + '/' + v))(db)
           };
         }).filter((v) => {
-          return schema_ids.indexOf(v.id) !== -1;
+          return v.id && schema_ids.indexOf(v.id) !== -1;
         }).reverse();
 
         if (migrations.length === 0) {

diff --git a/core/required/model_factory.js b/core/required/model_factory.js
@@ -33,6 +33,7 @@ class ModelFactory {
 
     return fs
       .readdirSync(dir)
+      .filter(filename => filename.indexOf('.') !== 0)
       .map(filename => require(`${process.cwd()}/app/models/${filename}`))
 
   }