fix M::M::Base::FETCH_CODE_ATTRIBUTES, warn() about CDBI::FromCGI errors, fix array...

[maypole.git] / lib / Maypole / Model / CDBI.pm

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index e1d665291f55afb16b78451c2f4ffa60b50315ea..a02f36fc6b1102a7d2a58d85e82a956099d81e8c 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -17,11 +17,62 @@ Maypole::Model::CDBI - Model class based on Class::DBI
 
 =head1 DESCRIPTION
 
-This is a master model class which uses C<Class::DBI> to do all the hard
+This is a master model class which uses L<Class::DBI> to do all the hard
 work of fetching rows and representing them as objects. It is a good
 model to copy if you're replacing it with other database abstraction
 modules.
 
+It implements a base set of methods required for a Maypole Data Model.
+See L<Maypole::Model::Base> for these:
+
+=over 4
+
+=item adopt
+
+=item class_of
+
+=item do_edit
+
+=item list
+
+=item related
+
+=item setup_database
+
+=item fetch_objects
+
+=back 
+
+=head1 Additional Actions
+
+=over 
+
+=item delete
+
+Unsuprisingly, this command causes a database record to be forever lost.
+
+=item search
+
+The search action 
+
+=back
+
+=head1 Helper Methods
+
+=over 
+
+=item order
+
+=item stringify_column
+
+=item do_pager
+
+=item related_class
+
+Given an accessor name as a method, this function returns the class this accessor returns.
+
+=back
+
 =cut
 
 sub related {
@@ -29,37 +80,63 @@ sub related {
     return keys %{ $self->meta_info('has_many') || {} };
 }
 
+sub related_class {
+    my ( $self, $r, $accessor ) = @_;
+
+    my $related = $self->meta_info( has_many => $accessor ) ||
+                  $self->meta_info( has_a    => $accessor ) ||
+                  return;
+
+    my $mapping = $related->{args}->{mapping};
+    if ( @$mapping ) {
+        return $related->{foreign_class}->meta_info('has_a')->{ $$mapping[0] }
+          ->{foreign_class};
+    }
+    else {
+        return $related->{foreign_class};
+    }
+}
+
 sub do_edit : Exported {
     my ( $self, $r ) = @_;
     my $h        = CGI::Untaint->new( %{ $r->{params} } );
     my $creating = 0;
     my ($obj) = @{ $r->objects || [] };
+    my $fatal;
     if ($obj) {
-
         # We have something to edit
-        $obj->update_from_cgi( $h =>
-              { required => $r->{config}{ $r->{table} }{required_cols} || [], }
-        );
+        eval {
+            $obj->update_from_cgi( $h =>
+                { required => $r->{config}{ $r->{table} }{required_cols} || [], }
+            );
+        };
+        $fatal = $@;
     }
     else {
-        $obj =
-          $self->create_from_cgi( $h =>
-              { required => $r->{config}{ $r->{table} }{required_cols} || [], }
-          );
+        eval {
+            $obj =
+                $self->create_from_cgi( $h =>
+                    { required => $r->{config}{ $r->{table} }{required_cols} || [], }
+            );
+        };
+        if ($fatal = $@) {
+            warn "$fatal" if $r->debug;
+        }
         $creating++;
     }
-    if ( my %errors = $obj->cgi_update_errors ) {
+    if ( my %errors = $fatal ? (FATAL => $fatal) : $obj->cgi_update_errors ) {
 
         # Set it up as it was:
         $r->{template_args}{cgi_params} = $r->{params};
         $r->{template_args}{errors}     = \%errors;
-        $r->{template}                  = "edit";
-        undef $obj if $creating;    # Couldn't create
+
+        undef $obj if $creating;
+        $r->template("edit");
     }
     else {
         $r->{template} = "view";
     }
-    $r->objects( [$obj] );
+    $r->objects( $obj ? [$obj] : []);
 }
 
 sub delete : Exported {
@@ -97,7 +174,8 @@ sub search : Exported {
     my $oper   = "like";                                # For now
     my %params = %{ $r->{params} };
     my %values = map { $_ => { $oper, $params{$_} } }
-      grep { $params{$_} and $fields{$_} } keys %params;
+      grep { defined $params{$_} && length ($params{$_}) && $fields{$_} }
+      keys %params;
 
     $r->template("list");
     if ( !%values ) { return $self->list($r) }
@@ -105,8 +183,9 @@ sub search : Exported {
     $self = $self->do_pager($r);
     $r->objects(
         [
-            $self->search_where( \%values ),
-            ( $order ? { order => $order } : () )
+            $self->search_where(
+                \%values, ( $order ? { order_by => $order } : () )
+            )
         ]
     );
     $r->{template_args}{search} = 1;
@@ -114,7 +193,7 @@ sub search : Exported {
 
 sub do_pager {
     my ( $self, $r ) = @_;
-    if ( my $rows = $r->config->{rows_per_page} ) {
+    if ( my $rows = $r->config->rows_per_page ) {
         return $r->{template_args}{pager} =
           $self->pager( $rows, $r->query->{page} );
     }
@@ -144,27 +223,42 @@ sub list : Exported {
 }
 
 sub setup_database {
-    my ( $self, $config, $namespace, $dsn, $u, $p, $opts ) = @_;
-    $dsn  ||= $config->{dsn};
-    $u    ||= $config->{user};
-    $p    ||= $config->{pass};
-    $opts ||= $config->{opts};
-    $config->{dsn}    = $dsn;
-    $config->{loader} = Class::DBI::Loader->new(
-        namespace => $namespace,
-        dsn       => $dsn,
-        user      => $u,
-        password  => $p,
-        options   => $opts,
+    my ( $class, $config, $namespace, $dsn, $u, $p, $opts ) = @_;
+    $dsn  ||= $config->dsn;
+    $u    ||= $config->user;
+    $p    ||= $config->pass;
+    $opts ||= $config->opts;
+    $config->dsn($dsn);
+    warn "No DSN set in config" unless $dsn;
+    $config->loader || $config->loader(
+        Class::DBI::Loader->new(
+            namespace => $namespace,
+            dsn       => $dsn,
+            user      => $u,
+            password  => $p,
+            options   => $opts,
+        )
     );
     $config->{classes} = [ $config->{loader}->classes ];
     $config->{tables}  = [ $config->{loader}->tables ];
+    warn( 'Loaded tables: ' . join ',', @{ $config->{tables} } )
+      if $namespace->debug;
 }
 
 sub class_of {
     my ( $self, $r, $table ) = @_;
-    return $r->config->{loader}->_table2class($table);
+    return $r->config->loader->_table2class($table);
 }
 
-1;
+sub fetch_objects {
+    my ($class, $r)=@_;
+    my @pcs = $class->primary_columns;
+    if ( $#pcs ) {
+    my %pks;
+        @pks{@pcs}=(@{$r->{args}});
+        return $class->retrieve( %pks );
+    }
+    return $class->retrieve( $r->{args}->[0] );
+}
 
+1;