@nocobase/database 0.9.3-alpha.1 → 0.9.4-alpha.1

package/src/update-guard.ts

@@ -10,6 +10,7 @@ type UpdateValues = {
 };
 
 type UpdateAction = 'create' | 'update';
+
 export class UpdateGuard {
   model: ModelStatic<any>;
   action: UpdateAction;
@@ -18,6 +19,21 @@ export class UpdateGuard {
   private blackList: BlackList;
   private whiteList: WhiteList;
 
+  static fromOptions(model, options) {
+    const guard = new UpdateGuard();
+    guard.setModel(model);
+    guard.setWhiteList(options.whitelist);
+    guard.setBlackList(options.blacklist);
+    guard.setAction(lodash.get(options, 'action', 'update'));
+    guard.setAssociationKeysToBeUpdate(options.updateAssociationValues);
+
+    if (options.underscored) {
+      guard.underscored = options.underscored;
+    }
+
+    return guard;
+  }
+
   setAction(action: UpdateAction) {
     this.action = action;
   }
@@ -78,6 +94,10 @@ export class UpdateGuard {
       let associationValues = associationsValues[association];
 
       const filterAssociationToBeUpdate = (value) => {
+        if (value === null) {
+          return value;
+        }
+
         const associationKeysToBeUpdate = this.associationKeysToBeUpdate || [];
 
         if (associationKeysToBeUpdate.includes(association)) {
@@ -111,7 +131,7 @@ export class UpdateGuard {
 
       if (Array.isArray(associationValues)) {
         associationValues = associationValues.map((value) => {
-          if (typeof value == 'string' || typeof value == 'number') {
+          if (value === undefined || value === null || typeof value == 'string' || typeof value == 'number') {
             return value;
           } else {
             return sanitizeValue(value);
@@ -155,19 +175,4 @@ export class UpdateGuard {
 
     return result;
   }
-
-  static fromOptions(model, options) {
-    const guard = new UpdateGuard();
-    guard.setModel(model);
-    guard.setWhiteList(options.whitelist);
-    guard.setBlackList(options.blacklist);
-    guard.setAction(lodash.get(options, 'action', 'update'));
-    guard.setAssociationKeysToBeUpdate(options.updateAssociationValues);
-
-    if (options.underscored) {
-      guard.underscored = options.underscored;
-    }
-
-    return guard;
-  }
 }

package/src/utils.ts

@@ -1,69 +1,8 @@
 import crypto from 'crypto';
 import Database from './database';
 import { IdentifierError } from './errors/identifier-error';
-import { Model } from './model';
 import lodash from 'lodash';
 
-type HandleAppendsQueryOptions = {
-  templateModel: any;
-  queryPromises: Array<any>;
-};
-
-export async function handleAppendsQuery(options: HandleAppendsQueryOptions) {
-  const { templateModel, queryPromises } = options;
-
-  if (!templateModel) {
-    return [];
-  }
-
-  const primaryKey = templateModel.constructor.primaryKeyAttribute;
-
-  const results = await Promise.all(queryPromises);
-
-  let rows: Array<Model>;
-
-  for (const appendedResult of results) {
-    if (!rows) {
-      rows = appendedResult.rows;
-
-      if (rows.length == 0) {
-        return [];
-      }
-
-      const modelOptions = templateModel['_options'];
-      for (const row of rows) {
-        row['_options'] = {
-          ...row['_options'],
-          include: modelOptions['include'],
-          includeNames: modelOptions['includeNames'],
-          includeMap: modelOptions['includeMap'],
-        };
-      }
-      continue;
-    }
-
-    for (let i = 0; i < appendedResult.rows.length; i++) {
-      const appendingRow = appendedResult.rows[i];
-      const key = appendedResult.include.association;
-      const val = appendingRow.get(key);
-
-      const rowKey = appendingRow.get(primaryKey);
-
-      const targetIndex = rows.findIndex((row) => row.get(primaryKey) === rowKey);
-
-      if (targetIndex === -1) {
-        throw new Error('target row not found');
-      }
-
-      rows[targetIndex].set(key, val, {
-        raw: true,
-      });
-    }
-  }
-
-  return rows;
-}
-
 export function md5(value: string) {
   return crypto.createHash('md5').update(value).digest('hex');
 }