my ($sql, $bind) = $self->next::method(@_);
# stringify bind args, quote via $dbh, and manually insert
- #my ($op, $extra_bind, $ident, $args) = @_;
- my $ident = $_[2];
+ #my ($op, $ident, $args) = @_;
+ my $ident = $_[1];
my @sql_part = split /\?/, $sql;
my $new_sql;
- my $col_info = $self->_resolve_column_info($ident, [ map $_->[0], @$bind ]);
+ my $col_info = $self->_resolve_column_info(
+ $ident, [ map { $_->[0]{dbic_colname} || () } @$bind ]
+ );
- foreach my $bound (@$bind) {
- my $col = shift @$bound;
+ for (@$bind) {
+ my $datatype = $col_info->{ $_->[0]{dbic_colname}||'' }{data_type};
- my $datatype = $col_info->{$col}{data_type};
+ my $data = (ref $_->[1]) ? "$_->[1]" : $_->[1]; # always stringify
- foreach my $data (@$bound) {
- $data = ''.$data if ref $data;
+ $data = $self->_prep_interpolated_value($datatype, $data)
+ if $datatype;
- $data = $self->_prep_bind_value($datatype, $data)
- if $datatype;
+ $data = $self->_get_dbh->quote($data)
+ unless $self->interpolate_unquoted($datatype, $data);
- $data = $self->_dbh->quote($data)
- if (!$datatype || $self->should_quote_value($datatype, $data));
-
- $new_sql .= shift(@sql_part) . $data;
- }
+ $new_sql .= shift(@sql_part) . $data;
}
+
$new_sql .= join '', @sql_part;
return ($new_sql, []);
}
-=head2 should_quote_value
+=head2 interpolate_unquoted
This method is called by L</_prep_for_execute> for every column in
order to determine if its value should be quoted or not. The arguments
are the current column data type and the actual bind value. The return
-value is interpreted as: true - do quote, false - do not quote. You should
+value is interpreted as: true - do not quote, false - do quote. You should
override this in you Storage::DBI::<database> subclass, if your RDBMS
does not like quotes around certain datatypes (e.g. Sybase and integer
-columns). The default method always returns true (do quote).
+columns). The default method always returns false (do quote).
WARNING!!!
=cut
-sub should_quote_value {
+sub interpolate_unquoted {
#my ($self, $datatype, $value) = @_;
- return 1;
+ return 0;
}
-=head2 _prep_bind_value
+=head2 _prep_interpolated_value
Given a datatype and the value to be inserted directly into a SQL query, returns
the necessary string to represent that value (by e.g. adding a '$' sign)
=cut
-sub _prep_bind_value {
+sub _prep_interpolated_value {
#my ($self, $datatype, $value) = @_;
return $_[2];
}