Changeset 1452

Show
Ignore:
Timestamp:
02/23/10 10:37:39 (3 years ago)
Author:
benoitg
Message:

Fix schema update 69. It would fail for everyone who experiences #701

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog-auth/wifidog/include/schema_validate.php

    r1451 r1452  
    15031503            $nodes = array(); 
    15041504            $db->execSql("SELECT node_id FROM nodes where network_id = '{$network['network_id']}'", $nodes, false); 
    1505             foreach ($nodes as $node) { 
    1506                 $node_guid = get_guid(); 
    1507                 $sql .= "INSERT INTO hotspot_graph_elements values('{$node_guid}', '{$node['node_id']}', 'Node' );\n "; 
    1508                 $sql .= "INSERT INTO hotspot_graph(child_element_id, parent_element_id) VALUES ('{$node_guid}', '{$new_guid}');\n"; 
     1505            if ($nodes) { 
     1506                foreach ($nodes as $node) { 
     1507                    $node_guid = get_guid(); 
     1508                    $sql .= "INSERT INTO hotspot_graph_elements values('{$node_guid}', '{$node['node_id']}', 'Node' );\n "; 
     1509                    $sql .= "INSERT INTO hotspot_graph(child_element_id, parent_element_id) VALUES ('{$node_guid}', '{$new_guid}');\n"; 
     1510                } 
    15091511            } 
    15101512        } 
    … …  
    15291531        printUpdateVersion($new_schema_version); 
    15301532        $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n"; 
     1533        $sql .= "\n\nDELETE FROM hotspot_graph_element_has_content WHERE content_id NOT IN (SELECT content_id from content);\n"; 
    15311534        $sql .= "\n\nALTER TABLE hotspot_graph_element_has_content ADD CONSTRAINT contentfk FOREIGN KEY (content_id) REFERENCES content(content_id) ON UPDATE CASCADE ON DELETE CASCADE;\n"; 
    15321535    }