column_info tests, AsForm select fixings and docs.

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@508 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index e65caa2ba46f85ad3eac4002409c6a1e55992aa1..2045d2ea94de5df2946339a93b57f706bacd18ae 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -686,23 +686,16 @@ sub column_default {
        my $info = $class->_column_info->{$col} || 
                           eval { $class->_isa_class($col)->_column_info($col) } ||
                           return '';
        my $info = $class->_column_info->{$col} || 
                           eval { $class->_isa_class($col)->_column_info($col) } ||
                           return '';

-
+       

     my $def = $info->{COLUMN_DEF};
     my $def = $info->{COLUMN_DEF};

-    $def = '' unless defined $def;
-
-    # exclude defaults we don't want to display-- may need some additions here
-    if ( $class->column_type($col)  =~ /^BOOL/i ) {
-            $def = $def ? 1 : 0; # allow 0 or 1 for bool cols
-    }
-    else {
-        $def = $def =~ /(^0000-00-00.*$|^0[0]*$|^0\.00$|CURRENT_TIMESTAMP|NULL)/i ? '' : $def ;
- 
-    }
-    return $def;
+    $def = '' unless defined $def; # is this good?
+       return $def;

 }
 
 
 
 }
 
 
 

+
+

 =head2 get_classmetadata
 
 Gets class meta data *excluding cgi input* for the passed in class or the
 =head2 get_classmetadata
 
 Gets class meta data *excluding cgi input* for the passed in class or the

diff --git a/lib/Maypole/Model/CDBI/AsForm.pm b/lib/Maypole/Model/CDBI/AsForm.pm
index f1fe978b1c36e7273f883d54a364cda003ec97ae..9beaa8dc7288af5a50a6545b623cb2cb116bd5fd 100644 (file)
--- a/lib/Maypole/Model/CDBI/AsForm.pm
+++ b/lib/Maypole/Model/CDBI/AsForm.pm
@@ -1,10 +1,6 @@
 package Maypole::Model::CDBI::AsForm;
 
 #TODO -- 
 package Maypole::Model::CDBI::AsForm;
 
 #TODO -- 

-# lots of doc
-# _to_select_or_create  -- select input stays
-# _to_create_or_select  -- create input trumps
-# 

 
 # TESTED and Works --
 #  has_many select -- $obj->to_field($has_many_col);   # select one form many
 
 # TESTED and Works --
 #  has_many select -- $obj->to_field($has_many_col);   # select one form many


@@ -34,7 +30,7 @@ our @EXPORT =
                _options_from_array _options_from_hash 
     );
 
                _options_from_array _options_from_hash 
     );
 

-our $VERSION = '.10'; 
+our $VERSION = '.95'; 

 
 =head1 NAME
 
 
 =head1 NAME
 


@@ -74,17 +70,17 @@ __PACKAGE__->has_many('jobs'  => 'Job',
 package Employer;
 __PACKAGE__->has_many('jobs'  => 'Job',);
 __PACKAGE__->has_many('contacts'  => 'Contact',
 package Employer;
 __PACKAGE__->has_many('jobs'  => 'Job',);
 __PACKAGE__->has_many('contacts'  => 'Contact',

-            order_by => 'name DESC',
+                       order_by => 'name DESC',

 );
 
 
   # Choose some jobs to add to a contact (has multiple attribute).
   my $job_sel = Contact->to_field('jobs'); # Uses constraint and order by
 );
 
 
   # Choose some jobs to add to a contact (has multiple attribute).
   my $job_sel = Contact->to_field('jobs'); # Uses constraint and order by

-    
+

 
   # Choose a job from $contact->jobs 
   my $job_sel = $contact->to_field('jobs');
 
   # Choose a job from $contact->jobs 
   my $job_sel = $contact->to_field('jobs');

-    
+

 
 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION


@@ -108,22 +104,22 @@ example usages.
   $beer->to_field($col, $args);
 
 Not all _to_* methods pay attention to all arguments. For example, '_to_textfield' does not look in $args->{'items'} at all.
   $beer->to_field($col, $args);
 
 Not all _to_* methods pay attention to all arguments. For example, '_to_textfield' does not look in $args->{'items'} at all.

- 
+

 =over
 
 =item name -- the name the element will have , this trumps the derived name.
 
   $beer->to_field('brewery', 'readonly', {
 =over
 
 =item name -- the name the element will have , this trumps the derived name.
 
   $beer->to_field('brewery', 'readonly', {

-               name => 'brewery_id'
+               name => 'brewery_id'

   });
   });

-  
+

 =item value -- the initial value the element will have, trumps derived value
 
   $beer->to_field('brewery', 'textfield', { 
                name => 'brewery_id', value => $beer->brewery,
                # however, no need to set value since $beer is object
   });
 =item value -- the initial value the element will have, trumps derived value
 
   $beer->to_field('brewery', 'textfield', { 
                name => 'brewery_id', value => $beer->brewery,
                # however, no need to set value since $beer is object
   });

- 
+

 =item items -- array of items generally used to make select box options
 
 Can be array of objects, hashes, arrays, or strings, or just a hash.
 =item items -- array of items generally used to make select box options
 
 Can be array of objects, hashes, arrays, or strings, or just a hash.


@@ -132,7 +128,7 @@ Can be array of objects, hashes, arrays, or strings, or just a hash.
    $beer->to_field(rating =>  select => {
                items => [1 , 2, 3, 4, 5],
    });
    $beer->to_field(rating =>  select => {
                items => [1 , 2, 3, 4, 5],
    });

- 
+

    # Select a Brewery to visit in the UK
    Brewery->to_field(brewery_id => {
                items => [ Brewery->search_like(location => 'UK') ],
    # Select a Brewery to visit in the UK
    Brewery->to_field(brewery_id => {
                items => [ Brewery->search_like(location => 'UK') ],


@@ -154,11 +150,11 @@ Can be an simple scalar id, an object, or an array of either
 This in almost always derived in cases where it may be difficult to derive, --
    # Select beers to serve on handpump
    Pub->to_field(handpumps => select => {
 This in almost always derived in cases where it may be difficult to derive, --
    # Select beers to serve on handpump
    Pub->to_field(handpumps => select => {

-               class => 'Beer', order_by => 'name ASC', multiple => 1,
+               class => 'Beer', order_by => 'name ASC', multiple => 1,

        });
 
 =item column_type -- a string representing column type
        });
 
 =item column_type -- a string representing column type

-   
+

   $pub->to_field('open', 'bool_select', {
                column_type => "bool('Closed', 'Open'),
   });
   $pub->to_field('open', 'bool_select', {
                column_type => "bool('Closed', 'Open'),
   });


@@ -168,15 +164,15 @@ This in almost always derived in cases where it may be difficult to derive, --
 Generally this can be set to get or not get a null/empty option added to
 a select box.  AsForm attempts to call "$class->column_nullable" to set this
 and it defaults to true if there is no shuch method.
 Generally this can be set to get or not get a null/empty option added to
 a select box.  AsForm attempts to call "$class->column_nullable" to set this
 and it defaults to true if there is no shuch method.

-  
+

   $beer->to_field('brewery', { column_nullable => 1 });    
 
   $beer->to_field('brewery', { column_nullable => 1 });    
 

-=item r or request  -- the mapyole request object 
+=item r or request  -- the Mapyole request object 

 
 =item uri -- uri for a link , used in methods such as _to_link_hidden
 
  $beer->to_field('brewery', 'link_hidden', 
 
 =item uri -- uri for a link , used in methods such as _to_link_hidden
 
  $beer->to_field('brewery', 'link_hidden', 

-      {r => $r, uri => 'www.maypole.perl.org/brewery/view/'.$beer->brewery}); 
+         {r => $r, uri => 'www.maypole.perl.org/brewery/view/'.$beer->brewery}); 

  # an html link that is also a hidden input to the object. R is required to
  # make the uri  unless you  pass a  uri
 
  # an html link that is also a hidden input to the object. R is required to
  # make the uri  unless you  pass a  uri
 


@@ -185,18 +181,20 @@ and it defaults to true if there is no shuch method.
 These are used in making select boxes. order_by is a simple order by clause
 and constraint and join are hashes used to limit the rows selected. The
 difference is that join uses methods of the object and constraint uses 
 These are used in making select boxes. order_by is a simple order by clause
 and constraint and join are hashes used to limit the rows selected. The
 difference is that join uses methods of the object and constraint uses 

-static values. You can also specify these in the relationship arguments.
+static values. You can also specify these in the relationship definitions.
+See the relationships documentation of how to set arbitrayr meta info. 

 
   BeerDB::LondonBeer->has_a('brewery', 'BeerDB::Brewery', 
 
   BeerDB::LondonBeer->has_a('brewery', 'BeerDB::Brewery', 

-           order_by     => 'brewery_name ASC',
+                  order_by     => 'brewery_name ASC',

           constraint   => {location  => 'London'},
           'join'       => {'brewery_tablecolumn  => 'beer_obj_column'}, 
          );
           constraint   => {location  => 'London'},
           'join'       => {'brewery_tablecolumn  => 'beer_obj_column'}, 
          );

-          
+

 =item no_hidden_constraints -- 
 
 Tell AsForm not to make hidden inputs for relationship constraints. It does
 =item no_hidden_constraints -- 
 
 Tell AsForm not to make hidden inputs for relationship constraints. It does

-this  sometimes when making foreign inputs . 
+this  sometimes when making foreign inputs. However, i think it should not
+do this and that the FromCGI 's _create_related method should do it. 

 
 =back
 
 
 =back
 


@@ -214,29 +212,29 @@ columns and a hashref of hashes of arguments for each column.  If called with an
   # and dont want to call to_field a bunch of times just to tweak one or 
   # two of them.
   $self->to_cgi(@cols, {brewery => {  
   # and dont want to call to_field a bunch of times just to tweak one or 
   # two of them.
   $self->to_cgi(@cols, {brewery => {  

-                                     how => 'textfield' # too big for select 
+                                                                        how => 'textfield' # too big for select 

                                                                   }, 
                                                                   }, 

-                        style   => { 
-                                                            column_nullable => 0, 
-                                                            how => 'select', 
-                                                                    items => ['Ale', 'Lager']
+                                               style   => { 
+                                                                        column_nullable => 0, 
+                                                                        how => 'select', 
+                                                                        items => ['Ale', 'Lager']

                                                                   }
                                                                   }

-                                               }
+                                               });

 
 =cut
 
 sub to_cgi {
 
 =cut
 
 sub to_cgi {

-       my ($class, @columns) = @_; # pjs -- added columns arg
-       my $args = {};
-       if (not @columns) {
-               @columns = $class->columns;
-               # Eventually after stabalization, we could add display_columns 
-               #keys map { $_ => 1 } ($class->display_columns, $class->columns); 
-       }
-       else {
-               if ( ref $columns[-1] eq 'HASH' ) { $args = pop @columns; }
-       }
-       map { $_ => $class->to_field($_, $args->{$_}) } @columns;
+               my ($class, @columns) = @_; # pjs -- added columns arg
+               my $args = {};
+               if (not @columns) {
+                               @columns = $class->columns;
+                               # Eventually after stabalization, we could add display_columns 
+                               #keys map { $_ => 1 } ($class->display_columns, $class->columns); 
+               }
+               else {
+                               if ( ref $columns[-1] eq 'HASH' ) { $args = pop @columns; }
+               }
+               map { $_ => $class->to_field($_, $args->{$_}) } @columns;

 }
 
 =head2 to_field($field [, $how][, $args])
 }
 
 =head2 to_field($field [, $how][, $args])


@@ -255,23 +253,29 @@ See C<HOW Methods>. You can also pass this argument in $args->{how}.
 =cut
 
 sub to_field {
 =cut
 
 sub to_field {

-       my ($self, $field, $how, $args) = @_;
-    if (ref $how)   { $args = $how; $how = ''; }
-       unless ($how)   { $how = $args->{how} || ''; }
+               my ($self, $field, $how, $args) = @_;
+               if (ref $how)   { $args = $how; $how = ''; }
+               unless ($how)   { $how = $args->{how} || ''; }

 #warn "In to_field field is $field how is $how. args ar e" . Dumper($args) . " \n";
 #warn "In to_field field is $field how is $how. args ar e" . Dumper($args) . " \n";

+               # Set sensible default value
+               unless ($args->{default}) { 
+                               my $def = $self->column_default($field);
+                               # exclude defaults we don't want actually put as value for input
+                               if (defined $def) {
+                                               $def = $def =~ /(^0000-00-00.*$|^0[0]*$|^0\.00$|CURRENT_TIMESTAMP|NULL)/i ? '' : $def ;
+                                               $args->{default} = $def;
+                               }
+               }

 
 

-    #if (ref $field) { $args = $field; $field = '' }

 
 

-       #use Data::Dumper;
-       #warn "args to_field  are $field, . " . Dumper($how) . " ,  " . Dumper($args);
-       

 
 

-       return  $self->_field_from_how($field, $how, $args)   || 
-               $self->_field_from_relationship($field, $args) ||
-                       $self->_field_from_column($field, $args)  ||
-                       $self->_to_textfield($field, $args);
+               return  $self->_field_from_how($field, $how, $args)   || 
+               $self->_field_from_relationship($field, $args) ||
+               $self->_field_from_column($field, $args)  ||
+               $self->_to_textfield($field, $args);

 }
 
 }
 

+

 =head2 search_inputs
 
   my $cgi = $class->search_inputs ([$args]); # optional $args
 =head2 search_inputs
 
   my $cgi = $class->search_inputs ([$args]); # optional $args


@@ -288,7 +292,7 @@ the value is a list ref of columns to search on in the related class.
 
 Example:
   sub  BeerDB::Beer::search_columns {
 
 Example:
   sub  BeerDB::Beer::search_columns {

-     return ( 'name' , 'rating', { brewery => [ 'name', 'location'] } );
+        return ( 'name' , 'rating', { brewery => [ 'name', 'location'] } );

   }
 
   # Now foreign inputs are made for Brewery name and location and the
   }
 
   # Now foreign inputs are made for Brewery name and location and the


@@ -298,65 +302,65 @@ Example:
 
 
 sub search_inputs {
 
 
 sub search_inputs {

-    my ($class, $args) = @_;
-    $class = ref $class || $class;
-    #my $accssr_class = { $class->accessor_classes };
-    my %cgi;
-
-    $args->{columns} ||= $class->can('search_columns') ?[$class->search_columns] : [$class->display_columns];
-
-    foreach my $field ( @{ $args->{columns} } ) {
-               my $base_args = {
-                       no_hidden_constraints => 1,
-                       column_nullable => 1, # empty option on select boxes
-                       value  => '',
-               };
-        if ( ref $field eq "HASH" ) { # foreign search fields
-            my ($accssr, $cols)  = each %$field;
-                       $base_args->{columns} = $cols;
-            unless (  @$cols ) {
-                # default to search fields for related
-                #$cols =  $accssr_class->{$accssr}->search_columns;
-                die ("$class search_fields error: Must specify at least one column to search in the foreign object named '$accssr'");
-            }
-            my $fcgi  = $class->to_field($accssr, 'foreign_inputs', $base_args);
-
-            # unset the default values for a select box
-            foreach (keys %$fcgi) {
-                       my $el = $fcgi->{$_};
-                               if ($el->tag eq 'select') {
-                                       
-                                       $class->unselect_element($el);
-                                       my ($first, @content) = $el->content_list;
-                                       my @fc = $first->content_list;
-                                       my $val = $first ? $first->attr('value') : undef;  
-                                       if ($first and (@fc > 0 or (defined $val and $val ne '')) ) { # something ( $first->attr('value') ne '' or 
-                                                     
-                                          #(defined $first->attr('value') or $first->attr('value') ne ''))  
-                                          # push an empty option on stactk
-                                          $el->unshift_content(HTML::Element->new('option'));
-                                   }
+               my ($class, $args) = @_;
+               $class = ref $class || $class;
+               #my $accssr_class = { $class->accessor_classes };
+               my %cgi;
+
+               $args->{columns} ||= $class->can('search_columns') ?[$class->search_columns] : [$class->display_columns];
+
+               foreach my $field ( @{ $args->{columns} } ) {
+                               my $base_args = {
+                                               no_hidden_constraints => 1,
+                                               column_nullable => 1, # empty option on select boxes
+                                               value  => '',
+                               };
+                               if ( ref $field eq "HASH" ) { # foreign search fields
+                                               my ($accssr, $cols)  = each %$field;
+                                               $base_args->{columns} = $cols;
+                                               unless (  @$cols ) {
+                                                               # default to search fields for related
+                                                               #$cols =  $accssr_class->{$accssr}->search_columns;
+                                                               die ("$class search_fields error: Must specify at least one column to search in the foreign object named '$accssr'");
+                                               }
+                                               my $fcgi  = $class->to_field($accssr, 'foreign_inputs', $base_args);
+
+                                               # unset the default values for a select box
+                                               foreach (keys %$fcgi) {
+                                                               my $el = $fcgi->{$_};
+                                                               if ($el->tag eq 'select') {
+
+                                                                               $class->unselect_element($el);
+                                                                               my ($first, @content) = $el->content_list;
+                                                                               my @fc = $first->content_list;
+                                                                               my $val = $first ? $first->attr('value') : undef;  
+                                                                               if ($first and (@fc > 0 or (defined $val and $val ne '')) ) { # something ( $first->attr('value') ne '' or 
+
+                                                                                               #(defined $first->attr('value') or $first->attr('value') ne ''))  
+                                                                                               # push an empty option on stactk
+                                                                                               $el->unshift_content(HTML::Element->new('option'));
+                                                                               }
+                                                               }
+
+                                               }
+                                               $cgi{$accssr} = $fcgi;
+                                               delete $base_args->{columns};
+                               }
+                               else {
+                                               $cgi{$field} = $class->to_field($field, $base_args); #{no_select => $args->{no_select}{$field} });
+                                               my $el = $cgi{$field};
+                                               if ($el->tag eq 'select') {
+                                                               $class->unselect_element($el);
+                                                               my ($first, @content) = $el->content_list;
+                                                               if ($first and $first->content_list) { # something 
+                                                                               #(defined $first->attr('value') or $first->attr('value') ne ''))  
+                                                                               # push an empty option on stactk
+                                                                               $el->unshift_content(HTML::Element->new('option'));
+                                                               }
+                                               }

                                }
                                }

-                                       
-            }
-            $cgi{$accssr} = $fcgi;
-                       delete $base_args->{columns};

                }
                }

-        else {
-            $cgi{$field} = $class->to_field($field, $base_args); #{no_select => $args->{no_select}{$field} });
-               my $el = $cgi{$field};
-                       if ($el->tag eq 'select') {
-                               $class->unselect_element($el);
-                               my ($first, @content) = $el->content_list;
-                               if ($first and $first->content_list) { # something 
-                                          #(defined $first->attr('value') or $first->attr('value') ne ''))  
-                                          # push an empty option on stactk
-                                          $el->unshift_content(HTML::Element->new('option'));
-                               }
-                       }
-        }
-    }
-    return \%cgi;
+               return \%cgi;

 }
 
 
 }
 
 


@@ -368,14 +372,14 @@ sub search_inputs {
 
 =cut
 sub unselect_element {
 
 =cut
 sub unselect_element {

-   my ($self, $el) = @_;
-   #unless (ref $el eq 'HTML::Element') {
-   #$self->_croak ('Need an HTML::Element to unselect. You gave a ' . Dumper($el)); }
-   if ($el->tag eq 'select') {
-       foreach my $opt ($el->content_list) {
-           $opt->attr('selected', undef) if $opt->attr('selected');
-       }
-   }
+               my ($self, $el) = @_;
+               #unless (ref $el eq 'HTML::Element') {
+               #$self->_croak ('Need an HTML::Element to unselect. You gave a ' . Dumper($el)); }
+               if ($el->tag eq 'select') {
+                               foreach my $opt ($el->content_list) {
+                                               $opt->attr('selected', undef) if $opt->attr('selected');
+                               }
+               }

 }
 
 =head2 _field_from_how($field, $how,$args)
 }
 
 =head2 _field_from_how($field, $how,$args)


@@ -386,17 +390,17 @@ Override at will.
 =cut
 
 sub _field_from_how {
 =cut
 
 sub _field_from_how {

-       my ($self, $field, $how, $args) = @_;
-       return unless $how;
-       $args ||= {};
-       no strict 'refs';
-       my $meth = "_to_$how";
-       if (not $self->can($meth)) { 
-               warn "Class can not $meth";
+               my ($self, $field, $how, $args) = @_;
+               return unless $how;
+               $args ||= {};
+               no strict 'refs';
+               my $meth = "_to_$how";
+               if (not $self->can($meth)) { 
+                               warn "Class can not $meth";
+                               return;
+               }
+               return $self->$meth($field, $args); 

                return;
                return;

-       }
-       return $self->$meth($field, $args); 
-       return;

 }
 
 =head2 _field_from_relationship($field, $args)
 }
 
 =head2 _field_from_relationship($field, $args)


@@ -409,41 +413,41 @@ For has_a it will give select box
 =cut
 
 sub _field_from_relationship {
 =cut
 
 sub _field_from_relationship {

-       my ($self, $field, $args) = @_;
-       return unless $field;
-       my $rel_meta = $self->related_meta('r',$field) || return; 
-       my $rel_name = $rel_meta->{name};
-       #my $meta = $self->meta_info;
-       #grep{ defined $meta->{$_}{$field} } keys %$meta;
-       my $fclass = $rel_meta->foreign_class;
-       my $fclass_is_cdbi = $fclass ? $fclass->isa('Class::DBI') : 0;
-
-       # maybe has_a select 
-       if ($rel_meta->{name} eq 'has_a' and $fclass_is_cdbi) {
-           # This condictions allows for trumping of the has_a args
-               if  (not $rel_meta->{args}{no_select} and not $args->{no_select}) 
-               {
-               $args->{class} = $fclass;
-               return  $self->_to_select($field, $args);
+               my ($self, $field, $args) = @_;
+               return unless $field;
+               my $rel_meta = $self->related_meta('r',$field) || return; 
+               my $rel_name = $rel_meta->{name};
+               #my $meta = $self->meta_info;
+               #grep{ defined $meta->{$_}{$field} } keys %$meta;
+               my $fclass = $rel_meta->foreign_class;
+               my $fclass_is_cdbi = $fclass ? $fclass->isa('Class::DBI') : 0;
+
+               # maybe has_a select 
+               if ($rel_meta->{name} eq 'has_a' and $fclass_is_cdbi) {
+                               # This condictions allows for trumping of the has_a args
+                               if  (not $rel_meta->{args}{no_select} and not $args->{no_select}) 
+                               {
+                                               $args->{class} = $fclass;
+                                               return  $self->_to_select($field, $args);
+                               }
+                               return;

                }
                }

-               return;
-       }
-       # maybe has many select
-       if ($rel_meta->{name} eq 'has_many' and $fclass_is_cdbi and ref $self) {
-           # This condictions allows for trumping of the has_a args
-               if  (not $rel_meta->{args}{no_select} and not $args->{no_select}) 
-               {
-               $args->{class} = $fclass;
-                       my @itms = $self->$field; # need list not iterator
-                       $args->{items} = \@itms;
-               return  $self->_to_select($field, $args);
+               # maybe has many select
+               if ($rel_meta->{name} eq 'has_many' and $fclass_is_cdbi and ref $self) {
+                               # This condictions allows for trumping of the has_a args
+                               if  (not $rel_meta->{args}{no_select} and not $args->{no_select}) 
+                               {
+                                               $args->{class} = $fclass;
+                                               my @itms = $self->$field; # need list not iterator
+                                               $args->{items} = \@itms;
+                                               return  $self->_to_select($field, $args);
+                               }
+                               return;

                }
                }

-               return;
-       }

 
 

-               
-       
-       #NOOO!  maybe select from has_many 
+
+
+               #NOOO!  maybe select from has_many 

 #      if ($rel_type eq 'has_many' and ref $self) {
 #              $args->{items} ||= [$self->$field];
 #              # arg name || fclass pk name || field
 #      if ($rel_type eq 'has_many' and ref $self) {
 #              $args->{items} ||= [$self->$field];
 #              # arg name || fclass pk name || field


@@ -452,17 +456,17 @@ sub _field_from_relationship {
 #              }
 #      return  $self->_to_select($field, $args);
 #      }
 #              }
 #      return  $self->_to_select($field, $args);
 #      }

-#
-       # maybe foreign inputs 
-       my %local_cols = map { $_ => 1 } $self->columns; # includes is_a cols
-       if ($fclass_is_cdbi and (not $local_cols{$field} or $rel_name eq 'has_own'))
-       {
-               $args->{related_meta} = $rel_meta; # suspect faster to set these args 
-               return $self->_to_foreign_inputs($field, $args);
-       }
-       return;
+               #
+               # maybe foreign inputs 
+               my %local_cols = map { $_ => 1 } $self->columns; # includes is_a cols
+               if ($fclass_is_cdbi and (not $local_cols{$field} or $rel_name eq 'has_own'))
+               {
+                               $args->{related_meta} = $rel_meta; # suspect faster to set these args 
+                               return $self->_to_foreign_inputs($field, $args);
+               }
+               return;

 }
 }

-                       
+

 =head2 _field_from_column($field, $args)
 
 Returns an input based on the column's characteristics, namely type, or nothing.
 =head2 _field_from_column($field, $args)
 
 Returns an input based on the column's characteristics, namely type, or nothing.


@@ -471,111 +475,111 @@ Override at will.
 =cut
 
 sub _field_from_column {
 =cut
 
 sub _field_from_column {

-       my ($self, $field, $args) = @_;
-       return unless $field;
-       my $class = ref $self || $self;
-       # Get column type       
-    unless ($args->{column_type}) { 
-       if ($class->can('column_type')) {
-                       $args->{column_type} = $class->column_type($field);
-               }       
-               else {
-               # Right, have some of this
-               eval "package $class; Class::DBI::Plugin::Type->import()";
-               $args->{column_type} = $class->column_type($field);
+               my ($self, $field, $args) = @_;
+               return unless $field;
+               my $class = ref $self || $self;
+               # Get column type       
+               unless ($args->{column_type}) { 
+                               if ($class->can('column_type')) {
+                                               $args->{column_type} = $class->column_type($field);
+                               }       
+                               else {
+                                               # Right, have some of this
+                                               eval "package $class; Class::DBI::Plugin::Type->import()";
+                                               $args->{column_type} = $class->column_type($field);
+                               }

                }
                }

-    }
-    my $type = $args->{column_type};
+               my $type = $args->{column_type};

 
 

-       return $self->_to_textfield($field, $args)
+               return $self->_to_textfield($field, $args)

                if $type  and $type =~ /^(VAR)?CHAR/i;  #common type
                if $type  and $type =~ /^(VAR)?CHAR/i;  #common type

-       return $self->_to_textarea($field, $args)
+               return $self->_to_textarea($field, $args)

                if $type and $type =~ /^(TEXT|BLOB)$/i;
                if $type and $type =~ /^(TEXT|BLOB)$/i;

-       return $self->_to_enum_select($field, $args)  
+               return $self->_to_enum_select($field, $args)  

                if $type and  $type =~ /^ENUM\((.*?)\)$/i; 
                if $type and  $type =~ /^ENUM\((.*?)\)$/i; 

-       return $self->_to_bool_select($field, $args)
+               return $self->_to_bool_select($field, $args)

                if $type and  $type =~ /^BOOL/i; 
                if $type and  $type =~ /^BOOL/i; 

-       return $self->_to_readonly($field, $args)
-           if $type and $type =~ /^readonly$/i;
-       return;
+               return $self->_to_readonly($field, $args)
+               if $type and $type =~ /^readonly$/i;
+               return;

 }
 
 
 sub _to_textarea {
 }
 
 
 sub _to_textarea {

-       my ($self, $col, $args) = @_;
-       # pjs added default     
-    $args ||= {};
-    my $val =  $args->{value}; 
-    
-    unless (defined $val) {
-        if (ref $self) {
-                       $val = $self->$col; 
-               }
-               else { 
-                       $val = eval {$self->column_default($col);}; 
-               $val = '' unless defined $val;  
+               my ($self, $col, $args) = @_;
+               # pjs added default     
+               $args ||= {};
+               my $val =  $args->{value}; 
+
+               unless (defined $val) {
+                               if (ref $self) {
+                                               $val = $self->$col; 
+                               }
+                               else { 
+                                               $val = $args->{default}; 
+                                               $val = '' unless defined $val;  
+                               }

                }
                }

-       }
-    my ($rows, $cols) = _box($val);
-    $rows = $args->{rows} if $args->{rows};
-    $cols = $args->{cols} if $args->{cols};;
-    my $name = $args->{name} || $col; 
-       my $a =
+               my ($rows, $cols) = _box($val);
+               $rows = $args->{rows} if $args->{rows};
+               $cols = $args->{cols} if $args->{cols};;
+               my $name = $args->{name} || $col; 
+               my $a =

                HTML::Element->new("textarea", name => $name, rows => $rows, cols => $cols);
                HTML::Element->new("textarea", name => $name, rows => $rows, cols => $cols);

-       $a->push_content($val);
-       $OLD_STYLE && return $a->as_HTML;
-       $a;
+               $a->push_content($val);
+               $OLD_STYLE && return $a->as_HTML;
+               $a;

 }
 
 sub _to_textfield {
 }
 
 sub _to_textfield {

-    my ($self, $col, $args ) = @_;
-    use Carp qw/confess/;
-    confess "No col passed to _to_textfield" unless $col;
-    $args ||= {};
-    my $val  = $args->{value}; 
-    my $name = $args->{name} || $col; 
-
-    unless (defined $val) {
-        if (ref $self) {
-            # Case where column inflates.
-            # Input would get stringification which could be not good.
-            #  as in the case of Time::Piece objects
-            $val = $self->can($col) ? $self->$col : ''; # in case it is a virtual column
-            if (ref $val) {
-                               if (my $meta = $self->related_meta('',$col)) {
-                               if (my $code = $meta->{args}{deflate4edit} || $meta->{args}{deflate} ) {
-                       $val  = ref $code ? &$code($val) : $val->$code;
-                                       }
-                                       elsif ( $val->isa('Class::DBI') ) {
-                                           $val  = $val->id;
-                                       }
-                                       else { 
-                                               #warn "No deflate4edit code defined for $val of type " . 
-                                            #ref $val . ". Using the stringified value in textfield..";
-                                       }
-                       }
+               my ($self, $col, $args ) = @_;
+               use Carp qw/confess/;
+               confess "No col passed to _to_textfield" unless $col;
+               $args ||= {};
+               my $val  = $args->{value}; 
+               my $name = $args->{name} || $col; 
+
+               unless (defined $val) {
+                               if (ref $self) {
+                                               # Case where column inflates.
+                                               # Input would get stringification which could be not good.
+                                               #  as in the case of Time::Piece objects
+                                               $val = $self->can($col) ? $self->$col : ''; # in case it is a virtual column
+                                               if (ref $val) {
+                                                               if (my $meta = $self->related_meta('',$col)) {
+                                                                               if (my $code = $meta->{args}{deflate4edit} || $meta->{args}{deflate} ) {
+                                                                                               $val  = ref $code ? &$code($val) : $val->$code;
+                                                                               }
+                                                                               elsif ( $val->isa('Class::DBI') ) {
+                                                                                               $val  = $val->id;
+                                                                               }
+                                                                               else { 
+                                                                                               #warn "No deflate4edit code defined for $val of type " . 
+                                                                                               #ref $val . ". Using the stringified value in textfield..";
+                                                                               }
+                                                               }
+                                                               else {
+                                                                               $val  = $val->id if $val->isa("Class::DBI"); 
+                                                               }
+                                               }
+
+                               }

                                else {
                                else {

-                                       $val  = $val->id if $val->isa("Class::DBI"); 
-               }
-               }
-                       
-        }
-               else {
-               $val = eval {$self->column_default($col);};
-               $val = '' unless defined $val;
-        }
-    }
-       my $a;
-       # THIS If section is neccessary or you end up with "value" for a vaiue
-       # if val is 
-       $val = '' unless defined $val; 
-       $a = HTML::Element->new("input", type => "text", name => $name, value =>$val);
-    $OLD_STYLE && return $a->as_HTML;
-    $a;
+                                               $val = $args->{default}; 
+                                               $val = '' unless defined $val;
+                               }
+               }
+               my $a;
+               # THIS If section is neccessary or you end up with "value" for a vaiue
+               # if val is 
+               $val = '' unless defined $val; 
+               $a = HTML::Element->new("input", type => "text", name => $name, value =>$val);
+               $OLD_STYLE && return $a->as_HTML;
+               $a;

 }
 
 
 }
 
 

-# Too expensive version -- TODO
+# Old version

 #sub _to_select {
 #      my ($self, $col, $hint) = @_;
 #      my $fclass = $hint || $self->__hasa_rels->{$col}->[0];
 #sub _to_select {
 #      my ($self, $col, $hint) = @_;
 #      my $fclass = $hint || $self->__hasa_rels->{$col}->[0];


@@ -595,25 +599,21 @@ sub _to_textfield {
 
 
 
 
 
 

-# pjs 
-# -- Rewrote this to be efficient -- no object creation. 
-# -- Added option for CDBI classes to specify a limiting clause
-# via "has_a_select_limit". 
-# -- Added selected argument to set a selected 

 
 =head2 recognized arguments
 
 =head2 recognized arguments

- 
+

   selected => $object|$id,
   name     => $name,
   value    => $value,
   where    => SQL 'WHERE' clause,
   order_by => SQL 'ORDER BY' clause,
   selected => $object|$id,
   name     => $name,
   value    => $value,
   where    => SQL 'WHERE' clause,
   order_by => SQL 'ORDER BY' clause,

+  constraint => hash of constraints to search

   limit    => SQL 'LIMIT' clause,
   items    => [ @items_of_same_type_to_select_from ],
   class => $class_we_are_selecting_from
   stringify => $stringify_coderef|$method_name
   limit    => SQL 'LIMIT' clause,
   items    => [ @items_of_same_type_to_select_from ],
   class => $class_we_are_selecting_from
   stringify => $stringify_coderef|$method_name

-  
-  
+
+

 
 
 # select box requirements
 
 
 # select box requirements


@@ -623,18 +623,18 @@ sub _to_textfield {
   # related class and you choose one. 
   #Or explicitly you can create one and pass options like where and order
   BeerDB::Beer->to_field('brewery','select', {where => "location = 'Germany'");
   # related class and you choose one. 
   #Or explicitly you can create one and pass options like where and order
   BeerDB::Beer->to_field('brewery','select', {where => "location = 'Germany'");

-  
+

   # For has_many the default is to get a multiple select box with all objects.
   # If called as an object method, the objects existing ones will be selected. 
   Brewery::BeerDB->to_field('beers','select', {where => "rating > 5"}); 
   # For has_many the default is to get a multiple select box with all objects.
   # If called as an object method, the objects existing ones will be selected. 
   Brewery::BeerDB->to_field('beers','select', {where => "rating > 5"}); 

-  
+

 
 =head2  2. a select box for objects of arbitrary class -- say BeerDB::Beer for fun. 
   # general 
   BeerDB::Beer->to_field('', 'select', $options)
 
   BeerDB::Beer->to_field('', 'select'); # Select box of all the rows in class
 
 =head2  2. a select box for objects of arbitrary class -- say BeerDB::Beer for fun. 
   # general 
   BeerDB::Beer->to_field('', 'select', $options)
 
   BeerDB::Beer->to_field('', 'select'); # Select box of all the rows in class

-                                  # with PK as ID, $Class->to_field() same.
+                                                                 # with PK as ID, $Class->to_field() same.

   BeerDB::Beer->to_field('','select',{ where => "rating > 3 AND class like 'Ale'", order_by => 'rating DESC, beer_id ASC' , limit => 10});
   # specify exact where clause 
 
   BeerDB::Beer->to_field('','select',{ where => "rating > 3 AND class like 'Ale'", order_by => 'rating DESC, beer_id ASC' , limit => 10});
   # specify exact where clause 
 


@@ -645,24 +645,24 @@ sub _to_textfield {
 # 3. a select box for arbitrary set of objects 
  # Pass array ref of objects as first arg rather than field 
  $any_class_or_obj->to_field([BeerDB::Beer->search(favorite => 1)], 'select',);
 # 3. a select box for arbitrary set of objects 
  # Pass array ref of objects as first arg rather than field 
  $any_class_or_obj->to_field([BeerDB::Beer->search(favorite => 1)], 'select',);

- 
+

 
 =cut
 
 sub _to_select {
 
 =cut
 
 sub _to_select {

-    my ($self, $col, $args) = @_;
-    $args ||= {};
-       # Do we have items already ? Go no further. 
-    if ($args->{items} and ref $args->{items}) {  
-               my $a = $self->_select_guts($col,  $args);
+               my ($self, $col, $args) = @_;
+               $args ||= {};
+               # Do we have items already ? Go no further. 
+               if ($args->{items} and ref $args->{items}) {  
+                               my $a = $self->_select_guts($col,  $args);

        $OLD_STYLE && return $a->as_HTML;
                if ($args->{multiple}) { $a->attr('multiple', 'multiple');}
                return $a;
        }
        $OLD_STYLE && return $a->as_HTML;
                if ($args->{multiple}) { $a->attr('multiple', 'multiple');}
                return $a;
        }

+       
+       # Proceed with work

 
 

-       # Else what are we making a select box out of ?  
-       # No Column parameter --  means making a select box of args->class or self 
-    # Using all rows from class's table
+       my $rel_meta;  

     if (not $col) { 
                unless ($args->{class}) {
                $args->{class} = ref $self || $self;
     if (not $col) { 
                unless ($args->{class}) {
                $args->{class} = ref $self || $self;


@@ -673,7 +673,7 @@ sub _to_select {
         $col = $args->{class}->primary_column;
     }
     # Related Class maybe ? 
         $col = $args->{class}->primary_column;
     }
     # Related Class maybe ? 

-    elsif (my $rel_meta =  $self->related_meta('r:)', $col) ) {
+    elsif ($rel_meta =  $self->related_meta('r:)', $col) ) {

         $args->{class} = $rel_meta->{foreign_class};
         # related objects pre selected if object
                                
         $args->{class} = $rel_meta->{foreign_class};
         # related objects pre selected if object
                                


@@ -723,7 +723,16 @@ sub _to_select {
        }
 
        # Get items to select from
        }
 
        # Get items to select from

-    $args->{items} = _select_items($args);
+    my $items = _select_items($args); # array of hashrefs 
+
+       # Turn items into objects if related 
+       if ($rel_meta and not $args->{no_construct}) { 
+               my @objs = ();
+               push @objs, $rel_meta->{foreign_class}->construct($_) foreach @$items;
+               $args->{items} = \@objs; 
+       }
+       else { $args->{items} = $items; } 
+       

        #use Data::Dumper;
        #warn "Just got items. They are  " . Dumper($args->{items});
 
        #use Data::Dumper;
        #warn "Just got items. They are  " . Dumper($args->{items});
 


@@ -752,7 +761,7 @@ sub _list_intersect {
 ############
 # FUNCTION #
 ############
 ############
 # FUNCTION #
 ############

-# Get Items 
+# Get Items  returns array of hashrefs

 sub _select_items { 
        my $args = shift;
        my $fclass = $args->{class};
 sub _select_items { 
        my $args = shift;
        my $fclass = $args->{class};


@@ -779,7 +788,11 @@ sub _select_items {
        $sql .= " LIMIT " . $args->{limit} if $args->{limit};
        #warn "_select_items sql is : $sql";
 
        $sql .= " LIMIT " . $args->{limit} if $args->{limit};
        #warn "_select_items sql is : $sql";
 

-       return $fclass->db_Main->selectall_arrayref($sql);
+       my $sth = $fclass->db_Main->prepare($sql);
+       $sth->execute;
+       my @data;
+       while ( my $d = $sth->fetchrow_hashref ) {push @data, $d};  
+       return \@data;

 
 }
 
 
 }
 


@@ -803,11 +816,7 @@ sub _to_readonly {
 
 =head2 _to_enum_select
 
 
 =head2 _to_enum_select
 

-$sel_box = $self->_to_enum_select($column, "ENUM('Val1','Val2','Val3')");
-
-Returns an enum select box given a column name and an enum string.
-NOTE: The Plugin::Type does not return an enum string for mysql enum columns.
-This will not work unless you write your own column_type method in your model.
+Returns a select box for the an enum column type. 

 
 =cut
 
 
 =cut
 


@@ -819,11 +828,9 @@ sub _to_enum_select {
     my @enum_vals = split /\s*,\s*/, $enum;
 
     # determine which is pre selected --
     my @enum_vals = split /\s*,\s*/, $enum;
 
     # determine which is pre selected --

-    # if obj, the value is , otherwise use column_default which is the first
-    # value in the enum list unless it has been overridden

     my $selected = eval { $self->$col  };
     my $selected = eval { $self->$col  };

-    $selected = eval{$self->column_default($col)} unless defined $selected;
-    $selected = $enum_vals[0]               unless defined $selected;
+    $selected = $args->{default} unless defined $selected;
+    $selected = $enum_vals[0] unless defined $selected;

 
     my $a = HTML::Element->new("select", name => $col);
     for ( @enum_vals ) {
 
     my $a = HTML::Element->new("select", name => $col);
     for ( @enum_vals ) {


@@ -839,15 +846,9 @@ sub _to_enum_select {
 
 =head2 _to_bool_select
 
 
 =head2 _to_bool_select
 

-  my $sel = $self->_to_bool_select($column, $bool_string);
-
-This  makes select input for boolean column.  You can provide a
-bool string of form: Bool('zero','one') and those are used for option
-content. Onthervise No and Yes are used.
-TODO -- test without bool string.
+Returns a "No/Yes"  select box for a boolean column type. 

 
 =cut
 
 =cut

-

 # TCODO fix this mess with args
 sub _to_bool_select {
     my ($self, $col, $args) = @_;
 # TCODO fix this mess with args
 sub _to_bool_select {
     my ($self, $col, $args) = @_;


@@ -858,11 +859,11 @@ sub _to_bool_select {
                @bool_text = split /,/, $bool;
        }
 
                @bool_text = split /,/, $bool;
        }
 

-       # get selectedod 
+       # get selected 

        
        my $selected = $args->{value} if defined $args->{value};
        $selected = $args->{selected} unless defined $selected;
        
        my $selected = $args->{value} if defined $args->{value};
        $selected = $args->{selected} unless defined $selected;

-       $selected =  ref $self ? eval {$self->$col;} : $self->column_default($col)
+       $selected =  ref $self ? eval {$self->$col;} : $args->{default}

                unless (defined $selected);
 
     my $a = HTML::Element->new("select", name => $col);
                unless (defined $selected);
 
     my $a = HTML::Element->new("select", name => $col);


@@ -886,34 +887,30 @@ sub _to_bool_select {
 }
 
 
 }
 
 

-=head2 _to_hidden($col, $args)
+=head2 _to_hidden($field, $args)

 
 

-This makes a hidden html element. Give it a name and value or if name is
-a ref it will use the PK name and value of the object.
+This makes a hidden html element input. It uses the "name" and "value" 
+arguments. If one or both are not there, it will look for an object in 
+"items->[0]" or the caller. Then it will use $field or the primary key for
+name  and the value of the column by the derived name.

 
 =cut
 
 sub _to_hidden {
 
 =cut
 
 sub _to_hidden {

-    my ($self, $name, $val) = @_;
-    my $args = {};
-    my $obj;
-    if (ref $name and $name->isa("Class::DBI")) {
-       $obj = $name;
-       $name= ($obj->primary_columns)[0]->name;
-    }
-    if (ref $val) {
-               $args = $val;
-        $val = $args->{value};
-        $name = $args->{name} if $args->{name};
-    }
-    elsif (not $name ) { # hidding object caller
-        $self->_croak("No object available in _to_hidden") unless ref $self;
-        $name = ($self->primary_column)[0]->name;
-        $val  = $self->id;
-    }
+    my ($self, $field, $args) = @_;
+    $args ||= {};
+       my ($name, $value) = ($args->{'name'}, $args->{value});
+       $name = $field unless defined $name;
+       if (! defined $name and !defined $value) { # check for objects
+       my $obj = $args->{items}->[0] || $self;
+               unless (ref $obj) { die "_to_hidden cannot determine a value. It was passed a value argument or items object or called with an object."; }
+               $name = $obj->primary_column->name unless $name;
+               $value = $obj->$name unless $value;
+       }
+

     return HTML::Element->new('input', 'type' => 'hidden',
     return HTML::Element->new('input', 'type' => 'hidden',

-                              'name' => $name, 'value'=>$val
-    );
+                              'name' => $name, 'value'=>$value);
+    

 }
 
 =head2 _to_link_hidden($col, $args) 
 }
 
 =head2 _to_link_hidden($col, $args) 


@@ -948,28 +945,24 @@ sub _to_link_hidden {
     my $href =  $uri || $r->config->{uri_base} . "/". $obj->table."/view/".$obj->id;
     my $a = HTML::Element->new('a', 'href' => $href);
     $a->push_content("$obj");
     my $href =  $uri || $r->config->{uri_base} . "/". $obj->table."/view/".$obj->id;
     my $a = HTML::Element->new('a', 'href' => $href);
     $a->push_content("$obj");

-    $a->push_content($self->_to_hidden($name, $obj->id));
+    $a->push_content($self->to_field('blahfooey', 'hidden', {name => $name, value =>  $obj->id} ));
+

        $OLD_STYLE && return $a->as_HTML;
     $a;
 }
 
 =head2 _to_foreign_inputs
 
        $OLD_STYLE && return $a->as_HTML;
     $a;
 }
 
 =head2 _to_foreign_inputs
 

-$html_els = $class_or_obj->_to_foreign_inputs($accssr, [$fields, $accssr_meta]);
-
-Get inputs for the accessor's class.  Pass an array ref of fields to get
-inputs for only those fields. Otherwise display_columns or all columns is used. 
-If you have the meta info handy for the accessor you can pass that too.
-
-TODO make AsForm know more about the request like what action we are doing
-so it can use edit columns or search_columns
+Creates inputs for a foreign class, usually related to the calling class or 
+object. In names them so they do not clash with other names and so they 
+can be processed generically.  See _rename_foreign_inputs below  and 
+Maypole::Model::CDBI::FromCGI::classify_foreign_inputs.

 
 

-NOTE , this names the foreign inputs is a particular way so they can be
-processed with a general routine and so there are not name clashes.
+Arguments this recognizes are :

 
 

-args -
-related_meta -- if you have this, great, othervise it will determine or die
-columns  -- list of columns to make inputs for 
+       related_meta -- if you have this, great, othervise it will determine or die
+       columns  -- list of columns to make inputs for 
+       request (r) -- TODO the Maypole request so we can see what action  

 
 =cut
 
 
 =cut
 


@@ -1001,7 +994,8 @@ sub _to_foreign_inputs {
        # Make hidden inputs for constrained columns unless we are editing object
        # TODO -- is this right thing to do?
        unless (ref $classORobj || $args->{no_hidden_constraints}) {
        # Make hidden inputs for constrained columns unless we are editing object
        # TODO -- is this right thing to do?
        unless (ref $classORobj || $args->{no_hidden_constraints}) {

-               $inputs{$_} = $classORobj->_to_hidden($_, $constrained->{$_}) 
+               $inputs{$_} = $classORobj->to_field('blahfooey', 'hidden', 
+                                     {name => $_, value => $constrained->{$_}} ) 

                        foreach ( keys %$constrained );  
        }
        $self->_rename_foreign_input($accssr, \%inputs);
                        foreach ( keys %$constrained );  
        }
        $self->_rename_foreign_input($accssr, \%inputs);


@@ -1011,17 +1005,20 @@ sub _to_foreign_inputs {
 
 =head2 _hash_selected
 
 
 =head2 _hash_selected
 

-Method to make sense out of the "selected" argument which can be in a number
-of formats perhaps.  It returns a hashref with the the values of options to be
-as the keys. 
+*Function* to make sense out of the "selected" argument which has values of the 
+options that should be selected by default when making a select box.  It
+can be in a number formats.  This method returns a map of which options to 
+select with the values being the keys in the map ( {val1 => 1, val2 = 1} ).

 
 

-Below handles these formats for the "selected" slot in the arguments hash:
-  Object (with id method)
-  Scalar (assumes it is value)
-  Array ref *OF* objects, arrays of data (0 elmnt used), hashes of data
-    (id key used), and simple scalars.
-    
+Currently this method  handles the following formats for the "selected" argument
+and in the following ways

 
 

+  Object                               -- uses the id method  to get the value
+  Scalar                               -- assumes it *is* the value
+  Array ref of objects         -- same as Object
+  Arrays of data               -- uses the 0th element in each
+  Hashes of data               -- uses key named 'id'
+    

 =cut 
  
 ############
 =cut 
  
 ############


@@ -1077,9 +1074,10 @@ sub _hash_selected {
 
 =head2 _select_guts 
 
 
 =head2 _select_guts 
 

-Internal api  method to make the actual select box form elements.
+Internal api  method to make the actual select box form elements. 
+the data.

 
 

-3 types of lists making for -- 
+Items to make options out of can be 

   Hash, Array, 
   Array of CDBI objects.
   Array of scalars , 
   Hash, Array, 
   Array of CDBI objects.
   Array of scalars , 


@@ -1250,7 +1248,7 @@ sub _options_from_hashes {
                $opt->attr(selected => "selected") if $selected->{$val};
                my $content = ($fclass and $stringify and $fclass->can($stringify)) ? 
                              $fclass->$stringify($_) : 
                $opt->attr(selected => "selected") if $selected->{$val};
                my $content = ($fclass and $stringify and $fclass->can($stringify)) ? 
                              $fclass->$stringify($_) : 

-                                 join(' ', @$_);
+                                 join(' ', keys %$_);

                $opt->push_content( $content );
         push @res, $opt; 
     }
                $opt->push_content( $content );
         push @res, $opt; 
     }


@@ -1269,6 +1267,12 @@ sub _options_from_hashes {
 #      return ($select, $create);
 #}
        
 #      return ($select, $create);
 #}
        

+
+=head2 _to_checkbox 
+
+Makes a checkbox element -- TODO
+
+=cut

 # 
 # checkboxes: if no data in hand (ie called as class method), replace
 # with a radio button, in order to allow this field to be left
 # 
 # checkboxes: if no data in hand (ie called as class method), replace
 # with a radio button, in order to allow this field to be left


@@ -1288,7 +1292,11 @@ sub _to_checkbox {
     return $a;
 }
 
     return $a;
 }
 

+=head2 _to_radio

 
 

+Makes a radio button element -- TODO
+
+=cut

 # TODO  -- make this general radio butons
 #
 sub _to_radio {
 # TODO  -- make this general radio butons
 #
 sub _to_radio {


@@ -1355,7 +1363,8 @@ sub _rename_foreign_input {
 
 =head2 foreign_input_delimiter
 
 
 =head2 foreign_input_delimiter
 

-This tells AsForm what to use to delmit forieign_input names with. The name has the form -- $foreign_accessor. $DELIMITER . $foreign_column 
+This tells AsForm what to use to delmit forieign input names. This is important
+to avoid name clashes as well as automating processing of forms. 

 
 =cut
 
 
 =cut
 


@@ -1398,6 +1407,8 @@ sub _box
 
 =head1 CHANGES
 
 
 =head1 CHANGES
 

+1.0 
+15-07-2004 -- Initial version

 =head1 MAINTAINER 
 
 Maypole Developers
 =head1 MAINTAINER 
 
 Maypole Developers

diff --git a/t/db_colinfo.t b/t/db_colinfo.t
index cb1b4361e1f91c0b6629a6a517b2c7390097cba8..ef2466fb002aa067a85aebf2fbed03dcd6008d77 100755 (executable)
--- a/t/db_colinfo.t
+++ b/t/db_colinfo.t
@@ -2,7 +2,7 @@
 use Test::More;
 use lib 'ex'; # Where BeerDB should live
 BEGIN {
 use Test::More;
 use lib 'ex'; # Where BeerDB should live
 BEGIN {

-   plan tests => 26;
+   plan tests => 44;

 }
 
 $db            = 'test';
 }
 
 $db            = 'test';


@@ -12,7 +12,7 @@ $table = "beer_test";
 $sql = "
 create table $table (
     id integer auto_increment primary key,
 $sql = "
 create table $table (
     id integer auto_increment primary key,

-    name char(30),
+    name char(30) NOT NULL default 'noname',

     url varchar(120),
     score smallint(2),
     price decimal(3,2),
     url varchar(120),
     score smallint(2),
     price decimal(3,2),


@@ -22,7 +22,7 @@ create table $table (
     tasted date NOT NULL,
     created timestamp default CURRENT_TIMESTAMP,
     modified datetime  default NULL,
     tasted date NOT NULL,
     created timestamp default CURRENT_TIMESTAMP,
     modified datetime  default NULL,

-    style mediumint(8) default 1,
+    style mediumint(8) NOT NULL default 1,

     brewery integer default NULL
 );";
 
     brewery integer default NULL
 );";
 


@@ -39,10 +39,28 @@ create table $table (
                  score         =>      'smallint',
                  price         =>      'decimal',
                  abv           =>      'varchar',
                  score         =>      'smallint',
                  price         =>      'decimal',
                  abv           =>      'varchar',

-                 notes         =>      '(text|blob)',
+                 notes         =>  '(text|blob)',

                  image         =>      'blob',
 );
 
                  image         =>      'blob',
 );
 

+# correct defaults 
+%correct_defaults = (
+                 created       =>      'CURRENT_TIMESTAMP', 
+                 modified      =>      undef, 
+                 style         => 1,   
+          name      => 'noname',
+);
+
+# correct nullables 
+%correct_nullables = (
+                 brewery   => 1, 
+                 modified      => 1,
+                 style         => 0,   
+          name      => 0, 
+                 tasted    => 0,
+);
+
+

 # Runs tests on column_* method of $class using %correct data hash  
 # usage: run_method_tests ($class, $method, %correct);
 sub run_method_tests { 
 # Runs tests on column_* method of $class using %correct data hash  
 # usage: run_method_tests ($class, $method, %correct);
 sub run_method_tests { 


@@ -86,7 +104,7 @@ if ($databases{test}) {
   $skip_msg = "Could not connect to MySQL using database 'test' as it doesn't exist, sorry";
 }
 
   $skip_msg = "Could not connect to MySQL using database 'test' as it doesn't exist, sorry";
 }
 

-$skip_howmany = 13;
+$skip_howmany = 22;

 
 SKIP: {
        skip $skip_msg, $skip_howmany  if $err;
 
 SKIP: {
        skip $skip_msg, $skip_howmany  if $err;


@@ -94,8 +112,8 @@ SKIP: {
        $DB_Class->db_Main->do($sql);
        $DB_Class->table($table); 
        run_method_tests($DB_Class,'column_type', %correct_types);
        $DB_Class->db_Main->do($sql);
        $DB_Class->table($table); 
        run_method_tests($DB_Class,'column_type', %correct_types);

-       #run_method_tests($DB_Class,'column_default', %correct_defaults);
-       #run_method_tests($DB_Class,'column_nullable', %correct_defaults);
+       run_method_tests($DB_Class,'column_default', %correct_defaults);
+       run_method_tests($DB_Class,'column_nullable', %correct_nullables);

 };
 
 # SQLite  test
 };
 
 # SQLite  test


@@ -107,7 +125,6 @@ package main;
 $DB_Class = 'BeerDB::BeerTestsqlite';
 
 $err = undef;
 $DB_Class = 'BeerDB::BeerTestsqlite';
 
 $err = undef;

-#unlink "t/test.db";

 if ( !-e "t/test.db" ) {
        eval {make_sqlite_db($sql)};
        $err = $@;
 if ( !-e "t/test.db" ) {
        eval {make_sqlite_db($sql)};
        $err = $@;


@@ -121,20 +138,18 @@ unless ($err) {
 }
 
 $skip_msg = "Could not connect to SQLite database 't/test.db'";
 }
 
 $skip_msg = "Could not connect to SQLite database 't/test.db'";

-$skip_howmany = 13;
+$skip_howmany = 22;

 
 SKIP: {
        skip $skip_msg, $skip_howmany  if $err; 
        $DB_Class->table($table); 
        run_method_tests($DB_Class,'column_type', %correct_types);
 
 SKIP: {
        skip $skip_msg, $skip_howmany  if $err; 
        $DB_Class->table($table); 
        run_method_tests($DB_Class,'column_type', %correct_types);

-       #run_method_tests($DB_Class,'column_default', %correct_defaults);
-       #run_method_tests($DB_Class,'column_nullable', %correct_defaults);
+       run_method_tests($DB_Class,'column_default', %correct_defaults);
+       run_method_tests($DB_Class,'column_nullable', %correct_nullables);

 
 };
 
 
 
 };
 
 

-
-

 # Helper methods, TODO -- put these somewhere where tests can use them.
 
 # returns "best" available sqlite driver or dies
 # Helper methods, TODO -- put these somewhere where tests can use them.
 
 # returns "best" available sqlite driver or dies