[Checkins] SVN: Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.py Fixing alias expression compiler.

[Attila Gobi]

Log message for revision 90640:
  Fixing alias expression compiler.
  
  

Changed:
  U   Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.py

-=-
Modified: Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.py
===================================================================
--- Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.py	2008-09-01 10:37:49 UTC (rev 90639)
+++ Sandbox/adamg/ocql/trunk/src/ocql/rewriter/rewriter.py	2008-09-01 12:13:13 UTC (rev 90640)
@@ -84,10 +84,16 @@
             elif ocql.queryobject.interfaces.IAlias.providedBy(firstTerm):
                 rv = Iter(
                         self.context.collection_type,
-                        Lambda(IRewriter(firstTerm.identifier)(),
-                               Single(self.context.collection_type,
-                                      IRewriter(firstTerm.identifier)())),
-                        Single(self.context.collection_type,
+                        Lambda(
+                            firstTerm.identifier.name,
+                            IRewriter(ocql.queryobject.queryobject.Query(
+                                self.context.metadata,
+                                self.context.symbols,
+                                self.context.collection_type,
+                                self.context.terms[1:],
+                                self.context.target
+                                ))()
+                        ), Single(self.context.collection_type,
                                IRewriter(firstTerm.expression)()))
 
             else: