projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change behavior of disable_cron_billing option, #19873
[freeside.git]
/
FS
/
FS
/
Record.pm
diff --git
a/FS/FS/Record.pm
b/FS/FS/Record.pm
index
a868d48
..
cdbcae0
100644
(file)
--- a/
FS/FS/Record.pm
+++ b/
FS/FS/Record.pm
@@
-458,7
+458,13
@@
sub qsearch {
# grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
# ) or croak "Error executing \"$statement\": ". $sth->errstr;
# grep defined( $record->{$_} ) && $record->{$_} ne '', @fields
# ) or croak "Error executing \"$statement\": ". $sth->errstr;
- $sth->execute or croak "Error executing \"$statement\": ". $sth->errstr;
+ my $ok = $sth->execute;
+ if (!$ok) {
+ my $error = "Error executing \"$statement\"";
+ $error .= ' (' . join(', ', map {"'$_'"} @value) . ')' if @value;
+ $error .= ': '. $sth->errstr;
+ croak $error;
+ }
my $table = $stable[0];
my $pkey = '';
my $table = $stable[0];
my $pkey = '';
@@
-1691,7
+1697,7
@@
sub batch_import {
my $data = slurp($file);
my $asn_output = $parser->decode( $data )
my $data = slurp($file);
my $asn_output = $parser->decode( $data )
- or
die
"No ". $asn_format->{'macro'}. " found\n";
+ or
return
"No ". $asn_format->{'macro'}. " found\n";
$asn_header_buffer = &{ $asn_format->{'header_buffer'} }( $asn_output );
$asn_header_buffer = &{ $asn_format->{'header_buffer'} }( $asn_output );
@@
-1788,6
+1794,8
@@
sub batch_import {
last unless scalar(@buffer);
my $row = shift @buffer;
last unless scalar(@buffer);
my $row = shift @buffer;
+ &{ $asn_format->{row_callback} }( $row, $asn_header_buffer )
+ if $asn_format->{row_callback};
foreach my $key ( keys %{ $asn_format->{map} } ) {
$hash{$key} = &{ $asn_format->{map}{$key} }( $row, $asn_header_buffer );
}
foreach my $key ( keys %{ $asn_format->{map} } ) {
$hash{$key} = &{ $asn_format->{map}{$key} }( $row, $asn_header_buffer );
}
@@
-1873,7
+1881,7
@@
sub batch_import {
return "Empty file!";
}
return "Empty file!";
}
- $dbh->commit or die $dbh->errstr if $oldAutoCommit;
;
+ $dbh->commit or die $dbh->errstr if $oldAutoCommit;
''; #no error
''; #no error
@@
-1899,10
+1907,10
@@
sub _h_statement {
my @values = map { _quote( $self->getfield($_), $self->table, $_) } @fields;
"INSERT INTO h_". $self->table. " ( ".
my @values = map { _quote( $self->getfield($_), $self->table, $_) } @fields;
"INSERT INTO h_". $self->table. " ( ".
- join(', ', qw(history_date history_user history_action), @fields ).
+ join(', ', qw(history_date history_user
num
history_action), @fields ).
") VALUES (".
join(', ', $time,
") VALUES (".
join(', ', $time,
-
dbh->quote( $FS::CurrentUser::CurrentUser->username )
,
+
$FS::CurrentUser::CurrentUser->usernum
,
dbh->quote($action),
@values
).
dbh->quote($action),
@values
).