[Jifty-commit] r3024 - in Jifty-DBI/trunk: lib/Jifty/DBI

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sun Mar 18 15:50:47 2007
New Revision: 3024

Modified:
   Jifty-DBI/trunk/   (props changed)
   Jifty-DBI/trunk/Makefile.PL
   Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm
   Jifty-DBI/trunk/lib/Jifty/DBI/Schema.pm

Log:
 r53607 at pinglin:  jesse | 2007-03-18 15:50:26 -0400
 * Finished sky++'s reversion of r3016, an accidental commit (merge bug)


Modified: Jifty-DBI/trunk/Makefile.PL
==============================================================================
--- Jifty-DBI/trunk/Makefile.PL	(original)
+++ Jifty-DBI/trunk/Makefile.PL	Sun Mar 18 15:50:47 2007
@@ -19,7 +19,9 @@
 requires('Lingua::EN::Inflect');
 requires('Object::Declare' => 0.22);
 requires('UNIVERSAL::require');
+requires('Scalar::Defer' => 0.10);
 requires('version');
+#requires('Class::Trigger');
 build_requires('Test::More' => 0.52);
 build_requires('DBD::SQLite');
 no_index directory => 'ex';

Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm	Sun Mar 18 15:50:47 2007
@@ -7,6 +7,7 @@
 use Lingua::EN::Inflect ();
 use Jifty::DBI::Column  ();
 use UNIVERSAL::require  ();
+use Scalar::Util      qw(blessed);
 use Jifty::DBI::Class::Trigger; # exports by default
 
 
@@ -468,7 +469,7 @@
                 <=> ( ( $a->type || '' ) eq 'serial' ) )
                 or ( ($a->sort_order || 0) <=> ($b->sort_order || 0))
                 or ( $a->name cmp $b->name )
-            } grep { $_->active } values %{ $self->COLUMNS || {} }
+            } grep { $_->active } values %{ $self->_columns_hashref }
 	])}
 }
 
@@ -490,7 +491,7 @@
                 <=> ( ( $a->type || '' ) eq 'serial' ) )
                 or ( ($a->sort_order || 0) <=> ($b->sort_order || 0))
                 or ( $a->name cmp $b->name )
-            } values %{ $self->COLUMNS || {} }
+            } values %{ $self->_columns_hashref || {} }
 }
 
 sub _columns_hashref {
@@ -886,7 +887,7 @@
                 $value = $hash{$key};
             }
 
-            if (ref $value && $value->isa('Jifty::DBI::Record') ) {
+            if (blessed $value && $value->isa('Jifty::DBI::Record') ) {
                 # XXX TODO: check for proper foriegn keyness here
                 $value = $value->id;
             }

Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Schema.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Schema.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Schema.pm	Sun Mar 18 15:50:47 2007
@@ -200,6 +200,21 @@
 
 	my @columns = &declare($code);
 
+	# Unimport all our symbols from the calling package,
+        # except for "lazy" and "defer".
+	foreach my $sym (@EXPORT) {
+            next if $sym eq 'lazy' or $sym eq 'defer';
+
+	    no strict 'refs';
+	    undef *{"$from\::$sym"}
+		if \&{"$from\::$sym"} == \&$sym;
+	}
+
+	foreach my $column (@columns) {
+	    next if !ref($column);
+	    _init_column($column);
+	}
+
         $from->_init_methods_for_columns;
     };