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

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Thu Dec 27 18:35:02 2007
New Revision: 4779

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

Log:
 r26220 at zoq-fot-pik:  chmrr | 2007-12-27 18:34:28 -0500
  * Revert mistaken change


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	Thu Dec 27 18:35:02 2007
@@ -258,9 +258,7 @@
     # 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 not grep { $_ eq 'Jifty::DBI::Filter::base64' }
-        ( $column->input_filters, $column->output_filters )
-         and $column->type !~ /^(blob|bytea)$/i )
+            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";
@@ -314,6 +312,7 @@
                 $subref = sub { return '' }
             }
         } else {
+
            # XXX sterling: should this be done with Class::ReturnValue instead
             $subref = sub {
                 Carp::croak(
@@ -321,7 +320,6 @@
                         . $self->schema_version );
             };
         }
-        require Sub::Name; Sub::Name::subname($package . "::" . $column_name, $subref);
         *{ $package . "::" . $column_name } = $subref;
 
     }
@@ -396,7 +394,6 @@
                         . $self->schema_version );
             };
         }
-        require Sub::Name; Sub::Name::subname($package . "::set_" . $column_name, $subref);
         *{ $package . "::" . "set_" . $column_name } = $subref;
     }
 }