[Jifty-commit] r5029 - in Jifty-DBI/branches/tisql: lib/Jifty/DBI

[Jifty commits]

Author: ruz
Date: Tue Feb  5 21:17:27 2008
New Revision: 5029

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

Log:
 r4779 at cubic-pc (orig r4778):  alexmv | 2007-12-28 02:29:35 +0300
  r26218 at zoq-fot-pik:  chmrr | 2007-12-27 18:28:25 -0500
   * UNIVERSAL::require has a memory leak, fixed by 0.11
 


Modified: Jifty-DBI/branches/tisql/Makefile.PL
==============================================================================
--- Jifty-DBI/branches/tisql/Makefile.PL	(original)
+++ Jifty-DBI/branches/tisql/Makefile.PL	Tue Feb  5 21:17:27 2008
@@ -20,7 +20,7 @@
 requires('Hash::Merge');
 requires('Lingua::EN::Inflect');
 requires('Object::Declare' => 0.22);
-requires('UNIVERSAL::require');
+requires('UNIVERSAL::require' => 0.11);
 requires('Scalar::Defer' => 0.10);
 requires('version');
 #requires('Class::Trigger');

Modified: Jifty-DBI/branches/tisql/lib/Jifty/DBI/Record.pm
==============================================================================
--- Jifty-DBI/branches/tisql/lib/Jifty/DBI/Record.pm	(original)
+++ Jifty-DBI/branches/tisql/lib/Jifty/DBI/Record.pm	Tue Feb  5 21:17:27 2008
@@ -258,7 +258,9 @@
     # Check for the correct column type when the Storable filter is in use
     if ( grep { $_ eq 'Jifty::DBI::Filter::Storable' }
         ( $column->input_filters, $column->output_filters )
-            and $column->type !~ /^(blob|bytea)$/i )
+         and not grep { $_ eq 'Jifty::DBI::Filter::base64' }
+        ( $column->input_filters, $column->output_filters )
+         and $column->type !~ /^(blob|bytea)$/i )
     {
         die "Column '$column_name' in @{[$column->record_class]} "
             . "uses the Storable filter but is not of type 'blob'.\n";
@@ -312,7 +314,6 @@
                 $subref = sub { return '' }
             }
         } else {
-
            # XXX sterling: should this be done with Class::ReturnValue instead
             $subref = sub {
                 Carp::croak(
@@ -320,6 +321,7 @@
                         . $self->schema_version );
             };
         }
+        require Sub::Name; Sub::Name::subname($package . "::" . $column_name, $subref);
         *{ $package . "::" . $column_name } = $subref;
 
     }
@@ -394,6 +396,7 @@
                         . $self->schema_version );
             };
         }
+        require Sub::Name; Sub::Name::subname($package . "::set_" . $column_name, $subref);
         *{ $package . "::" . "set_" . $column_name } = $subref;
     }
 }