Merge branch 'master' into anyevent

[spider.git] / perl / DXSql / mysql.pm

diff --git a/perl/DXSql/mysql.pm b/perl/DXSql/mysql.pm
index ff708da61f038ba76f6d4b6d16288672a388131e..f5a27a0791b30e31e40ef27bfec05e3a2737dc97 100644 (file)
--- a/perl/DXSql/mysql.pm
+++ b/perl/DXSql/mysql.pm
@@ -29,6 +29,29 @@ sub show_tables
        return @out;
 }
 
+sub has_ipaddr
+{
+       my $self = shift;
+       my $s = q(describe spot);
+       my $sth = $self->prepare($s);
+       $sth->execute;
+       while (my @t = $sth->fetchrow_array) {
+               if ($t[0] eq 'ipaddr') {
+                       $sth->finish;
+                       return 1;
+               }
+       }
+       $sth->finish;
+       return undef;
+}
+
+sub add_ipaddr
+{
+       my $self = shift;
+       my $s = q(alter table spot add column ipaddr varchar(40));
+       $self->do($s);
+}
+
 sub spot_create_table
 {
        my $self = shift;
@@ -47,7 +70,8 @@ spotcq tinyint,
 spotteritu tinyint,
 spottercq tinyint,
 spotstate char(2),
-spotterstate char(2)
+spotterstate char(2),
+ipaddr varchar(40)
 )};
        $self->do($s);
 }
@@ -55,10 +79,10 @@ spotterstate char(2)
 sub spot_add_indexes
 {
        my $self = shift;
-       $self->do('create index spot_ix1 on spot(time desc)');
        dbg('adding spot index ix1');
-       $self->do('create index spot_ix2 on spot(spotcall asc)');
+       $self->do('create index spot_ix1 on spot(time desc)');
        dbg('adding spot index ix2');
+       $self->do('create index spot_ix2 on spot(spotcall asc)');
 }