fix application or ordering for interface change

ipfs/go-datastore#110 Also, replace #22.
ipfs · Jan 24, 2019 · 12bf6c8 · 12bf6c8
1 parent 8b35261
commit 12bf6c8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/datastore.go b/datastore.go
@@ -173,8 +173,13 @@ func (a *accessor) queryOrig(q dsq.Query) (dsq.Results, error) {
 	for _, f := range q.Filters {
 		qr = dsq.NaiveFilter(qr, f)
 	}
-	for _, o := range q.Orders {
-		qr = dsq.NaiveOrder(qr, o)
+	if len(q.Orders) > 0 {
+		switch q.Orders[0].(type) {
+		case dsq.OrderByKey, *dsq.OrderByKey:
+			// Default ordering
+		default:
+			qr = dsq.NaiveOrder(qr, q.Orders...)
+		}
 	}
 	return qr, nil
 }

diff --git a/package.json b/package.json
@@ -21,9 +21,9 @@
     },
     {
       "author": "jbenet",
-      "hash": "Qmf4xQhNomPNhrtZc67qSnfJSjxjXs9LWvknJtSXwimPrM",
+      "hash": "QmPGYyi1DtuWyUkG3PtvLz1xb4ScjnUvwJMCoX3cxeyxNr",
       "name": "go-datastore",
-      "version": "3.4.1"
+      "version": "3.5.0"
     }
   ],
   "gxVersion": "0.8.0",