projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into anyevent
[spider.git]
/
perl
/
DXSql.pm
diff --git
a/perl/DXSql.pm
b/perl/DXSql.pm
index 437f3bbf5e22a34eba9022a115bb805eaf5bc245..d125cc59ca37ac4ba436a0438f8c1cb8ab0656fd 100644
(file)
--- a/
perl/DXSql.pm
+++ b/
perl/DXSql.pm
@@
-62,7
+62,7
@@
sub connect
my $dbh;
eval {
no strict 'refs';
my $dbh;
eval {
no strict 'refs';
- $dbh = DBI->connect($dsn, $user, $passwd
, {AutoCommit => 0}
);
+ $dbh = DBI->connect($dsn, $user, $passwd);
};
unless ($dbh) {
$active = 0;
};
unless ($dbh) {
$active = 0;
@@
-86,16
+86,19
@@
sub do
eval { $self->{dbh}->do($s); };
}
eval { $self->{dbh}->do($s); };
}
+sub begin_work
+{
+ $_[0]->{dbh}->begin_work;
+}
+
sub commit
{
$_[0]->{dbh}->commit;
sub commit
{
$_[0]->{dbh}->commit;
- $_[0]->{dbh}->{AutoCommit} = 0;
}
sub rollback
{
$_[0]->{dbh}->rollback;
}
sub rollback
{
$_[0]->{dbh}->rollback;
- $_[0]->{dbh}->{AutoCommit} = 0;
}
sub quote
}
sub quote
@@
-111,7
+114,7
@@
sub prepare
sub spot_insert_prepare
{
my $self = shift;
sub spot_insert_prepare
{
my $self = shift;
- return $self->prepare('insert into spot values(?' . ',?' x 1
4
. ')');
+ return $self->prepare('insert into spot values(?' . ',?' x 1
5
. ')');
}
sub spot_insert
}
sub spot_insert
@@
-121,6
+124,8
@@
sub spot_insert
my $sth = shift;
if ($sth) {
my $sth = shift;
if ($sth) {
+ push @$spot, undef while @$spot < 15;
+ pop @$spot while @$spot > 15;
eval {$sth->execute(undef, @$spot)};
} else {
my $s = "insert into spot values(NULL,";
eval {$sth->execute(undef, @$spot)};
} else {
my $s = "insert into spot values(NULL,";
@@
-137,7
+142,8
@@
sub spot_insert
$s .= $spot->[10] . ',';
$s .= $spot->[11] . ',';
$s .= (length $spot->[12] ? $self->quote($spot->[12]) : 'NULL') . ',';
$s .= $spot->[10] . ',';
$s .= $spot->[11] . ',';
$s .= (length $spot->[12] ? $self->quote($spot->[12]) : 'NULL') . ',';
- $s .= (length $spot->[13] ? $self->quote($spot->[13]) : 'NULL') . ')';
+ $s .= (length $spot->[13] ? $self->quote($spot->[13]) : 'NULL') . ',';
+ $s .= (length $spot->[14] ? $self->quote($spot->[14]) : 'NULL') . ')';
eval {$self->do($s)};
}
}
eval {$self->do($s)};
}
}