use base qw/SQL::Abstract::Limit/;
-sub select {
- my ($self, $ident, @rest) = @_;
- return $self->SUPER::select($self->from($ident), @rest);
-}
-
-sub from {
+sub _table {
my ($self, $from) = @_;
if (ref $from eq 'ARRAY') {
return $self->_recurse_from(@$from);
push(@sqlf, $self->_make_as($from));
foreach my $j (@join) {
my ($to, $on) = @$j;
- push(@sqlf, ' JOIN ');
+
+ # check whether a join type exists
+ my $join_clause = '';
+ if (ref($to) eq 'HASH' and exists($to->{-join_type})) {
+ $join_clause = ' '.uc($to->{-join_type}).' JOIN ';
+ } else {
+ $join_clause = ' JOIN ';
+ }
+ push(@sqlf, $join_clause);
+
if (ref $to eq 'ARRAY') {
push(@sqlf, '(', $self->_recurse_from(@$to), ')');
} else {
sub _make_as {
my ($self, $from) = @_;
- return join(' ', reverse each %$from);
+ return join(' ', map { $self->_quote($_) }
+ reverse each %{$self->_skip_options($from)});
+}
+
+sub _skip_options {
+ my ($self, $hash) = @_;
+ my $clean_hash = {};
+ $clean_hash->{$_} = $hash->{$_}
+ for grep {!/^-/} keys %$hash;
+ return $clean_hash;
}
sub _join_condition {
my ($self, $cond) = @_;
die "no chance" unless ref $cond eq 'HASH';
my %j;
- for (keys %$cond) { my $x = '= '.$cond->{$_}; $j{$_} = \$x; };
+ for (keys %$cond) { my $x = '= '.$self->_quote($cond->{$_}); $j{$_} = \$x; };
return $self->_recurse_where(\%j);
}
+sub _quote {
+ my ($self, $label) = @_;
+ return '' unless defined $label;
+ return $self->SUPER::_quote($label);
+}
+
} # End of BEGIN block
use base qw/DBIx::Class/;
return $new;
}
-sub get_simple {
- my ($self, $get) = @_;
- return $self->{$get};
-}
-
-sub set_simple {
- my ($self, $set, $val) = @_;
- return $self->{$set} = $val;
-}
-
=head1 NAME
DBIx::Class::Storage::DBI - DBI storage handler