Changed query_reference.dart to now support the new where style.

firebase · Oct 13, 2022 · 8c748b5 · 8c748b5
1 parent 6a2705f
commit 8c748b5
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 39 deletions.
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/movie.g.dart b/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/movie.g.dart
diff --git a/.../cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/templates/query_reference.dart b/.../cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/templates/query_reference.dart
@@ -503,9 +503,14 @@ class ${data.queryReferenceImplName}
   ${data.queryReferenceInterfaceName} where$titledNamed({$prototype}) {
 
     return ${data.queryReferenceImplName}(
-      reference.where('${field.name}', $parameters,),
       _collection,
+      \$referenceWithoutCursor: \$referenceWithoutCursor.where(${field.field}, $parameters),
+      \$queryCursor: \$queryCursor,
     );
+    // return ${data.queryReferenceImplName}(
+    //   reference.where('${field.name}', $parameters,),
+    //   _collection,
+    // );
   }
 ''',
         );
@@ -542,9 +547,14 @@ class ${data.queryReferenceImplName}
     }
 
     return ${data.queryReferenceImplName}(
-      reference.where('${field.name}', $parameters,),
       _collection,
+      \$referenceWithoutCursor: \$referenceWithoutCursor.where(${field.field}, $parameters),
+      \$queryCursor: \$queryCursor,
     );
+    // return ${data.queryReferenceImplName}(
+    //   reference.where('${field.name}', $parameters,),
+    //   _collection,
+    // );
   }
 ''',
         );
@@ -558,9 +568,14 @@ class ${data.queryReferenceImplName}
     whereNotIn?.forEach((e) { _whereNotInList?.add(e.name); });
 
     return ${data.queryReferenceImplName}(
-      reference.where('${field.name}', $parameters,),
       _collection,
+      \$referenceWithoutCursor: \$referenceWithoutCursor.where(${field.field}, $parameters),
+      \$queryCursor: \$queryCursor,
     );
+    // return ${data.queryReferenceImplName}(
+    //   reference.where('${field.name}', $parameters,),
+    //   _collection,
+    // );
   }
 ''',
         );