1 --- maypole.orig/lib/Maypole/Model/CDBI/Base.pm
2 +++ maypole/lib/Maypole/Model/CDBI/Base.pm
5 # Thanks to dave baird -- form builder for these private functions
8 +sub _init_column_info {
10 my $dbh = $self->db_Main;
15 my $colname = shift or die "Need a column for column_type";
16 - $class->_column_info() unless (ref $class->COLUMN_INFO);
17 + $class->_init_column_info() unless (ref $class->COLUMN_INFO);
19 if ($class->_isa_class($colname)) {
20 return $class->_isa_class($colname)->column_type($colname);
23 sub required_columns {
24 my ($class, $columns) = @_;
25 - $class->_column_info() unless (ref $class->COLUMN_INFO);
26 + $class->_init_column_info() unless (ref $class->COLUMN_INFO);
27 my $column_info = $class->COLUMN_INFO;
32 my ($class, $colname) = @_;
33 $colname or $class->_croak( "Need a column for column_required" );
34 - $class->_column_info() unless ref $class->COLUMN_INFO;
35 + $class->_init_column_info() unless ref $class->COLUMN_INFO;
36 if ($class->_isa_class($colname)) {
37 return $class->_isa_class($colname)->column_required($colname);
41 my $colname = shift or $class->_croak( "Need a column for column_nullable" );
43 - $class->_column_info() unless ref $class->COLUMN_INFO;
44 + $class->_init_column_info() unless ref $class->COLUMN_INFO;
45 if ($class->_isa_class($colname)) {
46 return $class->_isa_class($colname)->column_nullable($colname);
51 my $colname = shift or $class->_croak( "Need a column for column_default");
52 - $class->_column_info() unless (ref $class->COLUMN_INFO);
53 + $class->_init_column_info() unless (ref $class->COLUMN_INFO);
54 if ($class->_isa_class($colname)) {
55 return $class->_isa_class($colname)->column_default($colname);
58 $res{moniker} = $class->moniker;
59 $res{plural} = $class->plural_moniker;
60 $res{table} = $class->table;
61 - $res{column_metadata} = (ref $class->COLUMN_INFO) ? $class->COLUMN_INFO : $class->_column_info() ;
62 + $res{column_metadata} = (ref $class->COLUMN_INFO) ? $class->COLUMN_INFO : $class->_init_column_info() ;