[es] skip eid if already selected

es.py

@@ -92,9 +92,10 @@
     for rschema, tschema in schema.eschema(etype).attribute_definitions():
         if tschema.type in ('Int', 'Float'):
             attr = rschema.type
-            var = next(varmaker)
-            rql.append('%s %s %s' % (V, attr, var))
-            selected.append((attr, var))
+            if eid and attr != 'eid':
+                var = next(varmaker)
+                rql.append('%s %s %s' % (V, attr, var))
+                selected.append((attr, var))
     for attr in ('creation_date', 'modification_date',) + CUSTOM_ATTRIBUTES.get(etype, ()):
         var = next(varmaker)
         rql.append('%s %s %s' % (V, attr, var))
@@ -98,6 +99,10 @@
     for attr in ('creation_date', 'modification_date',) + CUSTOM_ATTRIBUTES.get(etype, ()):
         var = next(varmaker)
         rql.append('%s %s %s' % (V, attr, var))
+        selected.append((attr, var))
+    for attr in ('creation_date', 'modification_date'):
+        var = next(varmaker)
+        rql.append('%s %s %s' % (V, attr, var))
         selected.append(var)
     # TODO inlined relations ?
     return 'Any %s,%s %s' % (V, ','.join(selected),