Merged Apache2::MVC into Apache::MVC, deprecated $r->{query}

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

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index cbecaf1bebf82e2adf1b5d5891b938e10ac7e9ea..2a79850805008930c4f461e734c5bcb5a15d0161 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -36,9 +36,13 @@ sub do_edit :Exported {
     my ($obj) = @{$r->objects || []};
     if ($obj) {
         # We have something to edit
-        $obj->update_from_cgi($h);
+        $obj->update_from_cgi($h => {
+           required => $r->{config}{$r->{table}}{required_cols} || [],
+                                    });
     } else {
-        $obj = $self->create_from_cgi($h);
+        $obj = $self->create_from_cgi($h => {
+           required => $r->{config}{$r->{table}}{required_cols} || [],
+                                    });
         $creating++;
     }
     if (my %errors = $obj->cgi_update_errors) {
@@ -127,13 +131,18 @@ sub list :Exported {
 }
 
 sub setup_database {
-    my ($self, $config, $namespace, $dsn, $u, $p) = @_;
+    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,
     );
     $config->{classes} = [ $config->{loader}->classes ];
     $config->{tables}  = [ $config->{loader}->tables ];