Skip to content

RFC2: Core::Handle - make simple_query a little less simple #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RFC2: Core::Handle - make simple_query a little less simple #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 33 additions & 11 deletions Shared/lib/Dancer/Plugin/Database/Core/Handle.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,16 @@ sub _quick_query {
carp "Unrecognised query type $type!";
return;
}
if (!$table_name || ref $table_name) {
carp "Expected table name as a straight scalar";
return;
if ($type =~ m{^ (SELECT|COUNT) $}x && ref $table_name eq 'ARRAY') {
if (scalar(@$table_name) != 2) {
carp "join over more than one table";
return;
}
} else {
if (!$table_name || ref $table_name) {
carp "Expected table name as a straight scalar";
return;
}
}
if (($type eq 'INSERT' || $type eq 'UPDATE')
&& (!$data || ref $data ne 'HASH'))
Expand Down Expand Up @@ -323,16 +330,31 @@ sub _generate_sql {
$which_cols = join(',', map { $self->_quote_identifier($_) } @cols);
}

$table_name = $self->_quote_identifier($table_name);
my @bind_params;

my $sql = {
SELECT => "SELECT $which_cols FROM $table_name",
INSERT => "INSERT INTO $table_name ",
UPDATE => "UPDATE $table_name SET ",
DELETE => "DELETE FROM $table_name ",
COUNT => "SELECT COUNT(*) FROM $table_name",
}->{$type};
my $sql;
if (ref $table_name) {
my $payload = ($type eq 'COUNT') ? 'COUNT(*)' : $which_cols;
my @ts = map { $self->_quote_identifier($_); } @$table_name;
my $join = ($opts->{'join_type'}//'INNER') . " JOIN $ts[1]";
if (!ref $opts->{'join_keys'}) {
$join .= ' USING ' . $self->_quote_identifier($opts->{'join_keys'})
if ($opts->{'join_keys'});
} else {
$join .= " ON $ts[0]." . $self->_quote_identifier($opts->{'join_keys'}[0])
. " = $ts[1]." . $self->_quote_identifier($opts->{'join_keys'}[1]);
}
$sql = "SELECT $payload FROM $ts[0] $join";
} else {
$table_name = $self->_quote_identifier($table_name);
$sql = {
SELECT => "SELECT $which_cols FROM $table_name",
INSERT => "INSERT INTO $table_name ",
UPDATE => "UPDATE $table_name SET ",
DELETE => "DELETE FROM $table_name ",
COUNT => "SELECT COUNT(*) FROM $table_name",
}->{$type};
}
if ($type eq 'INSERT') {
my (@keys, @values);
for my $key (sort keys %$data) {
Expand Down