Fix bugs in service/datastore

service/datastore/finalized_query.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package datastore
 
 import (
         "bytes"
         "fmt"
         "sort"
@@ skipping 222 matching lines @@
         if len(q.project) != 0 {
                 if q.distinct {
                         ws(" DISTINCT")
                 }
                 proj := make([]string, len(q.project))
                 for i, p := range q.project {
                         proj[i] = gqlQuoteName(p)
                 }
                 ws(" ")
                 ws(strings.Join(proj, ", "))
+        } else if q.keysOnly {
+                ws(" __key__")
         } else {
                 ws(" *")
         }
 
         if q.kind != "" {
                 fmt.Fprintf(&ret, " FROM %s", gqlQuoteName(q.kind))
         }
 
         filts := []string(nil)
         anc := Property{}
@@ skipping 75 matching lines @@
         if q.ineqFiltProp == "__key__" {
                 if q.ineqFiltLowSet && !q.ineqFiltLow.Value().(*Key).Valid(false, aid, ns) {
                         return ErrInvalidKey
                 }
                 if q.ineqFiltHighSet && !q.ineqFiltHigh.Value().(*Key).Valid(false, aid, ns) {
                         return ErrInvalidKey
                 }
         }
         return nil
 }