Changeset 942

Show
Ignore:
Timestamp:
10/22/07 17:02:07 (10 months ago)
Author:
kindlund
Message:

Fixed DB code, where it assumed only one database was active in mysql.
Also fixed the _update logic to use proper WHERE clauses.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • honeyclient/trunk/bin/StartManager.pl

    r937 r942  
    2828my $driver = "HoneyClient::Agent::Driver::Browser::IE"; 
    2929my $config = undef; 
    30 my $maxrel = 4; 
     30my $maxrel = 5; 
    3131my $nexturl = ""; 
    3232my $urllist= ""; 

  • honeyclient/trunk/lib/HoneyClient/DB.pm

    r937 r942  
    723723                } 
    724724            } 
     725 
    725726            my @rows = $class->_select( 
    726727                '-columns'=>['id'], 
    …… 
    879880    my $sql = "SELECT "; $sql .= join( ',', @fields); $sql .= " FROM " . $class->_get_table(); 
    880881# Set condition statements 
    881     $sql .= _where_condition($args{'-where'}); 
     882    $sql .= $class->_where_condition($args{'-where'}); 
    882883    return $sql; 
    883884} 
    …… 
    13221323        # Check to see if a (Multi-field) UNIQUE key exists for Child Table 
    13231324        $sql = "SELECT COLUMN_NAME FROM information_schema.KEY_COLUMN_USAGE K WHERE TABLE_NAME=" 
    1324           . "'$ct' AND CONSTRAINT_NAME='${ct}_unique' ORDER BY ORDINAL_POSITION"; 
     1325          . "'$ct' AND CONSTRAINT_NAME='${ct}_unique' AND CONSTRAINT_SCHEMA='".$config{dbname}."' ORDER BY ORDINAL_POSITION"; 
    13251326 
    13261327        #DEBUG Output