Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5007/algebra/prop

Modified Files:
      Tag: XQuery_0-22
        prop_unq_names.c 
Log Message:
-- Fixing bug detected by Tom: Some attribute names were mapped incorrectly.


Index: prop_unq_names.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_unq_names.c,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -d -r1.28 -r1.28.2.1
--- prop_unq_names.c    1 Feb 2008 13:32:02 -0000       1.28
+++ prop_unq_names.c    17 Feb 2008 09:47:02 -0000      1.28.2.1
@@ -258,7 +258,7 @@
                argument are replaced by the overall join column name
                and all columns that are also referenced on the other
                side will be renamed by introducing a new unique name.
-               All other column stay unchanged. */
+               All other columns stay unchanged. */
             for (unsigned int i = 0; i < L(n)->schema.count; i++) {
                 ori = L(n)->schema.items[i].name;
                 child_unq = PFprop_unq_name (L(n)->prop, ori);
@@ -282,6 +282,8 @@
 
                     add_name_pair (np_list, ori, unq);
                 }
+                else if (child_unq == att2_unq)
+                    add_name_pair (np_list, ori, PFalg_unq_name (ori, id++));
                 else
                     add_name_pair (np_list, ori, child_unq);
 
@@ -311,6 +313,8 @@
 
                     add_name_pair (np_list, ori, unq);
                 }
+                else if (child_unq == att1_unq)
+                    add_name_pair (np_list, ori, PFalg_unq_name (ori, id++));
                 else
                     add_name_pair (np_list, ori, child_unq);
 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to