C3, inheritence changes and adding skeleton DFV model

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

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 5433beba42282488de1de6e584f1f9e36366f94c..50e4d30f1106f151658b13e84083708615f37bb3 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -1,5 +1,8 @@
 package Maypole::Model::CDBI;
 use strict;
+use Class::C3;
+
+use Data::Dumper;
 
 =head1 NAME
 
@@ -24,7 +27,6 @@ will instead use Class::DBI classes provided.
 =cut
 
 use base qw(Maypole::Model::Base Class::DBI);
-#use Class::DBI::Plugin::Type;
 use Class::DBI::Loader;
 use Class::DBI::AbstractSearch;
 use Class::DBI::Plugin::RetrieveAll;
@@ -33,7 +35,7 @@ use Lingua::EN::Inflect::Number qw(to_PL);
 use attributes ();
 
 use Maypole::Model::CDBI::AsForm;
-use Maypole::Model::CDBI::FromCGI; 
+use Maypole::Model::CDBI::FromCGI;
 use CGI::Untaint::Maypole;
 
 =head2 Untainter
@@ -42,13 +44,24 @@ Set the class you use to untaint and validate form data
 Note it must be of type CGI::Untaint::Maypole (takes $r arg) or CGI::Untaint
 
 =cut
+
 sub Untainter { 'CGI::Untaint::Maypole' };
 
-# or if you like bugs 
+=head2 add_model_superclass
 
-#use Class::DBI::FromCGI;
-#use CGI::Untaint;
-#sub Untainter { 'CGI::Untaint' };
+Adds model as superclass to model classes (if necessary)
+
+=cut
+
+sub add_model_superclass {
+  my ($class,$config) = @_;
+  foreach my $subclass ( @{ $config->classes } ) {
+    next if $subclass->isa("Maypole::Model::Base");
+    no strict 'refs';
+    push @{ $subclass . "::ISA" }, $config->model;
+  }
+  return;
+}
 
 
 __PACKAGE__->mk_classdata($_) for (qw/COLUMN_INFO/);
@@ -503,7 +516,6 @@ sub _isa_class {
 # sub _column_info {
 sub _column_info {
   my $self = shift;
-  warn "__column_info called by ", join (', ', caller), "\n";
   my $dbh = $self->db_Main;
 
   my $meta;                    # The info we are after
@@ -531,8 +543,7 @@ sub _hash_type_meta {
 
     # required / nullable
     $meta->{$colname}{nullable} = $row->{NULLABLE};
-
-    $meta->{$colname}{required} = ($row->{NULLABLE} && $row->{NULLABLE} == 0) ? 1 : 0;
+    $meta->{$colname}{required} = ( $meta->{$colname}{nullable} == 0 ) ? 1 : 0;
 
     # default
     if (defined $row->{COLUMN_DEF}) {
@@ -648,6 +659,7 @@ sub required_columns {
   my ($class, $columns) = @_;
   $class->_column_info() unless ref $class->COLUMN_INFO;
   my $column_info = $class->COLUMN_INFO;
+
   if ($columns) {
     foreach my $colname ( @$columns ) {
       if ($class->_isa_class($colname)) {
@@ -659,12 +671,12 @@ sub required_columns {
        warn "$colname is not a recognised column in this class ", ref $class || $class, "\n";
        next;
       }
-      $column_info->{required} = 1;
+      $column_info->{$colname}{required} = 1;
     }
     $class->COLUMN_INFO($column_info);
   }
 
-  return [ grep ($column_info->{$_}{required}, keys %{$column_info}) ] ;
+  return [ grep ($column_info->{$_}{required}, keys %$column_info) ] ;
 }
 
 =head2 column_required