Early return if entity is undefined

typeorm · Nov 27, 2018 · a457da5 · a457da5
1 parent 706d93f
commit a457da5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/metadata/ColumnMetadata.ts b/src/metadata/ColumnMetadata.ts
@@ -532,7 +532,7 @@ export class ColumnMetadata {
      * If column is in embedded (or recursive embedded) it extracts its value from there.
      */
      getEntityValue(entity: ObjectLiteral, transform: boolean = false): any|undefined {
-        // if (entity === undefined || entity === null) return undefined; // uncomment if needed
+        if (entity === undefined || entity === null) return undefined;
 
         // extract column value from embeddeds of entity if column is in embedded
         let value: any = undefined;
@@ -684,4 +684,4 @@ export class ColumnMetadata {
         return connection.namingStrategy.columnName(this.propertyName, this.givenDatabaseName, propertyNames);
     }
 
-}
+}
diff --git a/src/metadata/RelationMetadata.ts b/src/metadata/RelationMetadata.ts
@@ -325,7 +325,7 @@ export class RelationMetadata {
      * If column is in embedded (or recursive embedded) it extracts its value from there.
      */
     getEntityValue(entity: ObjectLiteral, getLazyRelationsPromiseValue: boolean = false): any|undefined {
-
+        if (entity === null || entity === undefined) return undefined;
         // extract column value from embeddeds of entity if column is in embedded
         if (this.embeddedMetadata) {
 
@@ -522,4 +522,4 @@ export class RelationMetadata {
         return this.embeddedMetadata.parentPropertyNames.join(".") + "." + this.propertyName;
     }
 
-}
+}