fix: handle more complex cascading views correctly

src/ChangeLog.ts

@@ -47,8 +47,8 @@ export class ChangeLog {
         const aViewName = a.changeSet.changes[0].dropView.viewName
         const bViewName = b.changeSet.changes[0].dropView.viewName
 
-        const aRegex = RegExp(`FROM ${aViewName}|JOIN ${aViewName}`, 'gm')
-        const bRegex = RegExp(`FROM ${bViewName}|JOIN ${bViewName}`, 'gm')
+        const aRegex = RegExp(`FROM \\(?${aViewName}|JOIN \\(?${aViewName}`, 'gm')
+        const bRegex = RegExp(`FROM \\(?${bViewName}|JOIN \\(?${bViewName}`, 'gm')
 
         // Does b directly depend on a
         if (bRegex.test(viewDefinitions[aViewName].definition)) {
@@ -181,8 +181,8 @@ export class ChangeLog {
         const aViewName = a.changeSet.changes[0].createView.viewName
         const bViewName = b.changeSet.changes[0].createView.viewName
 
-        const aRegex = RegExp(`FROM ${aViewName}|JOIN ${aViewName}`, 'gm')
-        const bRegex = RegExp(`FROM ${bViewName}|JOIN ${bViewName}`, 'gm')
+        const aRegex = RegExp(`FROM \\(?${aViewName}|JOIN \\(?${aViewName}`, 'gm')
+        const bRegex = RegExp(`FROM \\(?${bViewName}|JOIN \\(?${bViewName}`, 'gm')
 
         if (bRegex.test(a.changeSet.changes[0].createView.selectQuery)) {
           return 1
@@ -192,18 +192,18 @@ export class ChangeLog {
         }
 
         // Does a depend on any other view
-        for (const key in viewDefinitions) {
-          if (aRegex.test(viewDefinitions[key].definition)) {
-            return -1
-          }
-        }
-
-        // Does b depend on any other view
-        for (const key in viewDefinitions) {
-          if (bRegex.test(viewDefinitions[key].definition)) {
-            return 1
-          }
-        }
+ //       for (const key in viewDefinitions) {
+ //         if (aRegex.test(viewDefinitions[key].definition)) {
+ //           return -1
+ //         }
+ //       }
+ //
+ //       // Does b depend on any other view
+ //       for (const key in viewDefinitions) {
+ //         if (bRegex.test(viewDefinitions[key].definition)) {
+ //           return 1
+ //         }
+ //       }
 
         // Nothing? Then order by name
         return aViewName > bViewName ? -1 : 1

src/DataLoader.ts

@@ -47,7 +47,7 @@ export class DataLoader {
     if (folders.size === 0) return
     for (let folder of folders) {
       const files = await readdir(folder)
-      for (let each of files.filter(this._filterCsvFiles)) {
+      for (let each of files.filter(this._filterCsvFiles.bind(this))) {
         // Verify entity
         let name = each.replace(/-/g, '.').slice(0, -path.extname(each).length)
         let entity = this._entity4(name)
@@ -103,14 +103,16 @@ export class DataLoader {
     for (const row of rows) {
       const keyColumns = Object.keys(entity.keys)
       let where = keyColumns.reduce((set, col, index) => {
-        set[col] = row[index]
+        set[col] = row[cols.indexOf(col)];
         return set
       }, {})
 
       let record = await SELECT.from(entity.name).columns(keyColumns.join(',')).where(where)
       if (record.length > 0) {
         let set = cols.reduce((set, col, index) => {
-          set[col] = row[index]
+          if(typeof row[index] !== "undefined") {
+            set[col] = row[index];
+          }
           return set
         }, {})
         await UPDATE(entity.name).set(set).where(where)

src/util.ts

@@ -23,7 +23,7 @@ const sortByCasadingViews = (a: any, b: any) => {
     }
   }
 
-  return -1
+  return 0
 }
 
 export { sortByCasadingViews }