__PACKAGE__->mk_classdata('_table_name');
+__PACKAGE__->mk_classdata('table_alias'); # FIXME XXX
+
sub new {
my ($class, $attrs) = @_;
$class = ref $class if ref $class;
sub delete {
my $self = shift;
if (ref $self) {
+ #warn $self->_ident_cond.' '.join(', ', $self->_ident_values);
my $sth = $self->_get_sth('delete', undef,
$self->_table_name, $self->_ident_cond);
$sth->execute($self->_ident_values);
$sth->finish;
delete $self->{_in_database};
} else {
+ my $attrs = { };
+ if (@_ > 1 && ref $_[$#_] eq 'HASH') {
+ $attrs = { %{ pop(@_) } };
+ }
my $query = (ref $_[0] eq 'HASH' ? $_[0] : {@_});
- my ($cond, $param) = $self->_where_from_hash($query);
+ my ($cond, @param) = $self->_cond_resolve($query, $attrs);
my $sth = $self->_get_sth('delete', undef, $self->_table_name, $cond);
- $sth->execute(@$param);
+ $sth->execute(@param);
$sth->finish;
}
return $self;
$cond =~ s/^\s*WHERE//i;
my @cols = $class->_select_columns;
my $sth = $class->_get_sth( 'select', \@cols, $class->_table_name, $cond);
+ #warn "$cond @vals";
return $class->sth_to_objects($sth, \@vals, \@cols);
}
}
sub search {
- my $class = shift;
- my $where = ref $_[0] eq "HASH" ? shift: {@_};
- my ($cond, $param) = $class->_where_from_hash($where);
- return $class->retrieve_from_sql($cond, @{$param});
+ my $class = shift;
+ my $attrs = { };
+ if (@_ > 1 && ref $_[$#_] eq 'HASH') {
+ $attrs = { %{ pop(@_) } };
+ }
+ my $query = ref $_[0] eq "HASH" ? shift: {@_};
+ my ($cond, @param) = $class->_cond_resolve($query, $attrs);
+ return $class->retrieve_from_sql($cond, @param);
}
sub search_like {
my $class = shift;
- my $where = ref $_[0] eq "HASH" ? shift: {@_};
- my ($cond, $param) = $class->_where_from_hash($where, { cmp => 'like' });
- return $class->retrieve_from_sql($cond, @{$param});
+ my $attrs = { };
+ if (@_ > 1 && ref $_[$#_] eq 'HASH') {
+ $attrs = pop(@_);
+ }
+ return $class->search(@_, { %$attrs, cmp => 'LIKE' });
}
sub _select_columns {
return $new->insert;
}
-sub _where_from_hash {
- my ($self, $query, $opts) = @_;
- my $op = $opts->{'cmp'} || '=';
+sub _cond_resolve {
+ my ($self, $query, $attrs) = @_;
+ my $op = $attrs->{'cmp'} || '=';
my $cond = join(' AND ',
map { (defined $query->{$_}
? "$_ $op ?"
: (do { delete $query->{$_}; "$_ IS NULL"; }));
} keys %$query);
- return ($cond, [ values %$query ]);
+ return ($cond, values %$query);
}
sub table {