Merge pull request #1 from kingcody/0.2.7-x

Fallback to maybeOptions for findOne
typeorm · Sep 17, 2018 · 6a5eb44 · 6a5eb44
2 parents 501d826 + 00e45e0
commit 6a5eb44
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <a href="https://typeorm.io/">
+  <a href="http://typeorm.io/">
     <img src="https://github.com/typeorm/typeorm/raw/master/resources/logo_big.png" width="492" height="228">
   </a>
   <br>

diff --git a/docs/one-to-one-relations.md b/docs/one-to-one-relations.md
@@ -77,6 +77,7 @@ profile.photo = "me.jpg";
 await connection.manager.save(profile);
 
 const user = new User();
+user.name = 'Joe Smith';
 user.profile = profile;
 await connection.manager.save(user);
 ```

diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
@@ -63,7 +63,7 @@ TypeORM is able to on React Native apps using the [react-native-sqlite-storage](
 
 ## Expo
 
-TypeORM is able to run on Expo apps using the [Expo SQLite API](https://docs.expo.io/versions/latest/sdk/sqlite.html).
+TypeORM is able to run on Expo apps using the [Expo SQLite API](https://docs.expo.io/versions/latest/sdk/sqlite.html). For an example how to use TypeORM in Expo see [typeorm/react-native-example](https://github.com/typeorm/react-native-example).
 
 ## NativeScript
 

diff --git a/src/entity-manager/MongoEntityManager.ts b/src/entity-manager/MongoEntityManager.ts
@@ -165,16 +165,17 @@ export class MongoEntityManager extends EntityManager {
                           maybeOptions?: FindOneOptions<Entity>): Promise<Entity|undefined> {
         const objectIdInstance = PlatformTools.load("mongodb").ObjectID;
         const id = (optionsOrConditions instanceof objectIdInstance) || typeof optionsOrConditions === "string" ?  optionsOrConditions : undefined;
-        const query = this.convertFindOneOptionsOrConditionsToMongodbQuery((id ? maybeOptions : optionsOrConditions) as any) || {};
+        const findOneOptionsOrConditions = (id ? maybeOptions : optionsOrConditions) as any;
+        const query = this.convertFindOneOptionsOrConditionsToMongodbQuery(findOneOptionsOrConditions) || {};
         if (id) {
             query["_id"] = (id instanceof objectIdInstance) ? id : new objectIdInstance(id);
         }
         const cursor = await this.createEntityCursor(entityClassOrName, query);
-        if (FindOptionsUtils.isFindOneOptions(optionsOrConditions)) {
-            if (optionsOrConditions.select)
-                cursor.project(this.convertFindOptionsSelectToProjectCriteria(optionsOrConditions.select));
-            if (optionsOrConditions.order)
-                cursor.sort(this.convertFindOptionsOrderToOrderCriteria(optionsOrConditions.order));
+        if (FindOptionsUtils.isFindOneOptions(findOneOptionsOrConditions)) {
+            if (findOneOptionsOrConditions.select)
+                cursor.project(this.convertFindOptionsSelectToProjectCriteria(findOneOptionsOrConditions.select));
+            if (findOneOptionsOrConditions.order)
+                cursor.sort(this.convertFindOptionsOrderToOrderCriteria(findOneOptionsOrConditions.order));
         }
 
         // const result = await cursor.limit(1).next();
@@ -680,4 +681,4 @@ export class MongoEntityManager extends EntityManager {
         };
     }
 
-}
+}