[Jifty-commit] r2631 - Jifty-DBI/branches/od/lib/Jifty/DBI

[jifty-commit at lists.jifty.org]

Author: audreyt
Date: Fri Jan 26 23:41:14 2007
New Revision: 2631

Modified:
   Jifty-DBI/branches/od/lib/Jifty/DBI/Schema.pm

Log:
* Fix "refers_to" bug when cloning virtual columns with column name matching /_id$/.

Modified: Jifty-DBI/branches/od/lib/Jifty/DBI/Schema.pm
==============================================================================
--- Jifty-DBI/branches/od/lib/Jifty/DBI/Schema.pm	(original)
+++ Jifty-DBI/branches/od/lib/Jifty/DBI/Schema.pm	Fri Jan 26 23:41:14 2007
@@ -310,15 +310,14 @@
                 my $aliased_as = $1;
                 my $virtual_column = $from->add_column($aliased_as);
 
-                # XXX FIXME I think the next line is wrong, but things
-                # explode without it -- mostly because we unique-key
-                # on name instead of some conbination of name and
-                # alias_for_column in a couple places
-                $virtual_column->name( $name );
-                $virtual_column->aliased_as($aliased_as);
-#                $_->apply($virtual_column) for @args;
+                # Clone ourselves into the virtual column
+                %$virtual_column = %$column;
+
                 $column->refers_to(undef);
+
+                $virtual_column->aliased_as($aliased_as);
                 $virtual_column->alias_for_column($name);
+
                 $from->_init_methods_for_column($virtual_column);
             }
             $column->by('id') unless $column->by;