fix(deps): latest [email protected]

dal-go · Aug 21, 2023 · c2b08aa · c2b08aa
1 parent d02a499
commit c2b08aa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -4,8 +4,8 @@ go 1.20
 
 require (
 	cloud.google.com/go/firestore v1.12.0
-	github.com/dal-go/dalgo v0.4.0
-	github.com/dal-go/dalgo-end2end-tests v0.0.24
+	github.com/dal-go/dalgo v0.5.0
+	github.com/dal-go/dalgo-end2end-tests v0.0.25
 	github.com/pkg/errors v0.9.1
 	google.golang.org/api v0.138.0
 	google.golang.org/grpc v1.57.0

diff --git a/go.sum b/go.sum
@@ -67,6 +67,8 @@ github.com/dal-go/dalgo v0.2.31 h1:i+22Fn1Y2lYSna8sPJIdaPHAvfVijthXvXIXWe7GOUU=
 github.com/dal-go/dalgo v0.2.31/go.mod h1:741DXTLpQfmvkazyEiivX8OBFylpzS1QErdh/6WquqI=
 github.com/dal-go/dalgo v0.4.0 h1:fP8j7i5Rjv6qSdewME6ro5LTdIsBdHrzVeay5NWhSR0=
 github.com/dal-go/dalgo v0.4.0/go.mod h1:741DXTLpQfmvkazyEiivX8OBFylpzS1QErdh/6WquqI=
+github.com/dal-go/dalgo v0.5.0 h1:UTPWFkWNh5SFcLbrwdxM1OmV5HxFc/SWY2hEcDDZO28=
+github.com/dal-go/dalgo v0.5.0/go.mod h1:741DXTLpQfmvkazyEiivX8OBFylpzS1QErdh/6WquqI=
 github.com/dal-go/dalgo-end2end-tests v0.0.13 h1:j6EvE/4CxJ9qXE6wDFxhKIWDKVpGSm5adYdKDNESNU0=
 github.com/dal-go/dalgo-end2end-tests v0.0.13/go.mod h1:M8QDzcFqzXtCLEhNhRDE8CYUXPIFGR13ykGVux5E7tI=
 github.com/dal-go/dalgo-end2end-tests v0.0.14 h1:2FF1AuoINt3xS7g0mM+3FyY+DaK9O4dFNw6Dv51iyhQ=
@@ -89,6 +91,8 @@ github.com/dal-go/dalgo-end2end-tests v0.0.23 h1:gNeyprWgPXMw0wWT1gCL1OimQQWEVWm
 github.com/dal-go/dalgo-end2end-tests v0.0.23/go.mod h1:pZC7PmhquIU5N73tmdROGl0AS6ir6eHJgDM9C4R6IEo=
 github.com/dal-go/dalgo-end2end-tests v0.0.24 h1:fx3xdcB2tPve+Lw8znC51DhgxCaEwxOMFMOvQxclnts=
 github.com/dal-go/dalgo-end2end-tests v0.0.24/go.mod h1:y5KraugLVL5YbcQxloTT/eD85xW47GQlQUmEQetPJFw=
+github.com/dal-go/dalgo-end2end-tests v0.0.25 h1:OfKwE+m4jQvxfMN7plzw2EcjS70K+RV9WUxUCU7kRg4=
+github.com/dal-go/dalgo-end2end-tests v0.0.25/go.mod h1:63pBdJxxTot5XIr3vCoVKbps41vKBmtQuZ5jAtRW89I=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/query.go b/query.go
@@ -11,10 +11,17 @@ func dalQuery2firestoreIterator(c context.Context, q dal.Query, client *firestor
 	if client == nil {
 		panic("client is a required parameter, got nil")
 	}
-	query := client.Collection(q.From().Name).Offset(q.Offset())
+
+	fromName := q.From().Name
+
+	query := client.Collection(fromName).Query
+
 	if limit := q.Limit(); limit > 0 {
 		query.Limit(limit)
 	}
+	if offset := q.Offset(); offset > 0 {
+		query.Offset(offset)
+	}
 	if startFrom := q.StartFrom(); startFrom != "" {
 		query.StartAt(startFrom)
 	}