diff --git a/es.py b/es.py index 08eae6d4a792db6ee215c87a990973b0ed3ac1f8_ZXMucHk=..6527f18a1a6997c9893aafb2beb58ad38f0b2d18_ZXMucHk= 100644 --- a/es.py +++ b/es.py @@ -88,10 +88,10 @@ attr = rschema.type var = next(varmaker) rql.append('%s %s %s' % (V, attr, var)) - selected.append((attr, var)) + selected.append(var) for rschema, tschema in schema.eschema(etype).attribute_definitions(): if tschema.type in ('Int', 'Float'): attr = rschema.type if eid and attr != 'eid': var = next(varmaker) rql.append('%s %s %s' % (V, attr, var)) @@ -92,10 +92,10 @@ for rschema, tschema in schema.eschema(etype).attribute_definitions(): if tschema.type in ('Int', 'Float'): attr = rschema.type if eid and attr != 'eid': var = next(varmaker) rql.append('%s %s %s' % (V, attr, var)) - selected.append((attr, var)) + selected.append(var) for attr in ('creation_date', 'modification_date',) + CUSTOM_ATTRIBUTES.get(etype, ()): var = next(varmaker) rql.append('%s %s %s' % (V, attr, var)) @@ -99,7 +99,7 @@ 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)) + selected.append(var) for attr in ('creation_date', 'modification_date'): var = next(varmaker) rql.append('%s %s %s' % (V, attr, var))