fix application or ordering for interface change

Stebalien · Stebalien · commit 12bf6c82510d · 2019-01-24T10:09:19.000-08:00
ipfs/go-datastore#110 Also, replace #22.
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",

Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,13 @@ func (a *accessor) queryOrig(q dsq.Query) (dsq.Results, error) {`
`173`	`173`	`for _, f := range q.Filters {`
`174`	`174`	`qr = dsq.NaiveFilter(qr, f)`
`175`	`175`	`}`
`176`		`- for _, o := range q.Orders {`
`177`		`- qr = dsq.NaiveOrder(qr, o)`
	`176`	`+ if len(q.Orders) > 0 {`
	`177`	`+ switch q.Orders[0].(type) {`
	`178`	`+ case dsq.OrderByKey, *dsq.OrderByKey:`
	`179`	`+ // Default ordering`
	`180`	`+ default:`
	`181`	`+ qr = dsq.NaiveOrder(qr, q.Orders...)`
	`182`	`+ }`
`178`	`183`	`}`
`179`	`184`	`return qr, nil`
`180`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"author": "jbenet",`
`24`		`- "hash": "Qmf4xQhNomPNhrtZc67qSnfJSjxjXs9LWvknJtSXwimPrM",`
	`24`	`+ "hash": "QmPGYyi1DtuWyUkG3PtvLz1xb4ScjnUvwJMCoX3cxeyxNr",`
`25`	`25`	`"name": "go-datastore",`
`26`		`- "version": "3.4.1"`
	`26`	`+ "version": "3.5.0"`
`27`	`27`	`}`
`28`	`28`	`],`
`29`	`29`	`"gxVersion": "0.8.0",`