X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/a97d97a009197f5b5b72897e0b09fb5889e2eb90..d08a3f9c6b715d74e5b01eb8df39fe91776768d0:/SL/DB/Object.pm?ds=sidebyside diff --git a/SL/DB/Object.pm b/SL/DB/Object.pm index 52b9300a9..1d1703846 100644 --- a/SL/DB/Object.pm +++ b/SL/DB/Object.pm @@ -2,14 +2,13 @@ package SL::DB::Object; use strict; -use Readonly; use Rose::DB::Object; use List::MoreUtils qw(any); use SL::DB; -use SL::DB::Helpers::Attr; -use SL::DB::Helpers::Metadata; -use SL::DB::Helpers::Manager; +use SL::DB::Helper::Attr; +use SL::DB::Helper::Metadata; +use SL::DB::Helper::Manager; use base qw(Rose::DB::Object); @@ -31,7 +30,7 @@ sub init_db { } sub meta_class { - return 'SL::DB::Helpers::Metadata'; + return 'SL::DB::Helper::Metadata'; } sub _get_manager_class { @@ -41,7 +40,7 @@ sub _get_manager_class { return $class->meta->convention_manager->auto_manager_class_name($class); } -Readonly my %text_column_types => (text => 1, char => 1, varchar => 1); +my %text_column_types = (text => 1, char => 1, varchar => 1); sub assign_attributes { my $self = shift; @@ -61,9 +60,10 @@ sub _assign_attributes { while (my ($attribute, $value) = each %attributes) { my $type = lc($types{$attribute} || 'text'); - $value = $type eq 'boolean' ? ($value ? 't' : 'f') - : $text_column_types{$type} ? $value - : ($value || undef); + $value = $type eq 'boolean' ? ($value ? 't' : 'f') + : $text_column_types{$type} ? $value + : defined($value) && ($value eq '') ? undef + : $value; $self->$attribute($value); }