Skip to content
GitLab
Commit 6be0612d authored by Eric - kg6wxc's avatar Eric - kg6wxc
Browse files

Fixes to checkDB.inc (which was also moved to it's own file) 

If the SQL server has binary logging enabled then this will not work.
(by default it does not, you usually only need that for replication and other advanced features.)
parent 02d4dc55
Hide whitespace changes
Inline Side-by-side
scripts/checkDB.inc
View file @ 6be0612d
<?php <?php
function wxc_checkDB () { function wxc_checkDB () {
//this function should probably be in it's own file //this function is now in its own file
//removing the olsrinfo_json binary blob from the database tables //removing the olsrinfo_json binary blob from the database tables
//it's just taking up space and never getting used... //it's just taking up space and never getting used...
$olsrinfoQuery = "select table_name from information_schema.columns where table_schema = '" . $olsrinfoQuery = "select table_name from information_schema.columns where table_schema = '" .
$GLOBALS['USER_SETTINGS']['sql_db'] . "' and column_name = 'olsrinfo_json'"; $GLOBALS['USER_SETTINGS']['sql_db'] . "' and column_name = 'olsrinfo_json'";
$jsonBlobs = mysqli_query($GLOBALS['sql_connection'], $olsrinfoQuery); $jsonBlobs = mysqli_query($GLOBALS['sql_connection'], $olsrinfoQuery);
$olsrinfojsonBlobsNum = mysqli_num_rows($jsonBlobs); $olsrinfojsonBlobsNum = mysqli_num_rows($jsonBlobs);
if ($olsrinfojsonBlobsNum != 0) { if ($olsrinfojsonBlobsNum != 0) {
//$jsonBlobs = wxc_getMySql($sysinfoQuery); //$jsonBlobs = wxc_getMySql($sysinfoQuery);
//var_dump($jsonBlobs); //var_dump($jsonBlobs);
foreach ($jsonBlobs as $table) { foreach ($jsonBlobs as $table) {
foreach ($table as $table_name) { foreach ($table as $table_name) {
$alterQuery = 'alter table ' . $table_name . ' drop column olsrinfo_json'; $alterQuery = 'alter table ' . $table_name . ' drop column olsrinfo_json';
wxc_putMySql($alterQuery); wxc_putMySql($alterQuery);
$mesg = "olsrinfo_json binary blob removed from database table: " . $table_name . "!"; $mesg = "olsrinfo_json binary blob removed from database table: " . $table_name . "!";
wxc_echoWithColor($mesg, "red"); wxc_echoWithColor($mesg, "red");
echo "\n";
}
}
unset($jsonBlobs);
unset($olsrinfojsonBlobsNum);
unset($olsrinfoQuery);
wxc_echoWithColor("You had an old version of the Database tables. ", "orange");
wxc_echoWithColor("Fixed now...", "green");
echo "\nThis will make the database a lot smaller!\n";
echo "\n"; echo "\n";
}else {
unset($jsonBlobs);
unset($olsrinfojsonBlobsNum);
unset($olsrinfoQuery);
} }
}
unset($jsonBlobs);
unset($olsrinfojsonBlobsNum);
unset($olsrinfoQuery);
wxc_echoWithColor("You had an old version of the Database tables. ", "orange");
wxc_echoWithColor("Fixed now...", "green");
echo "\nThis will make the database a lot smaller!\n";
echo "\n";
}else {
unset($jsonBlobs);
unset($olsrinfojsonBlobsNum);
unset($olsrinfoQuery);
}
//removing the sysinfo_json binary blob from the database tables //removing the sysinfo_json binary blob from the database tables
//it's just taking up space and never getting used... //it's just taking up space and never getting used...
$sysinfoQuery = "select table_name from information_schema.columns where table_schema = '" . $sysinfoQuery = "select table_name from information_schema.columns where table_schema = '" .
$GLOBALS['USER_SETTINGS']['sql_db'] . "' and column_name = 'sysinfo_json'"; $GLOBALS['USER_SETTINGS']['sql_db'] . "' and column_name = 'sysinfo_json'";
$jsonBlobs = mysqli_query($GLOBALS['sql_connection'], $sysinfoQuery); $jsonBlobs = mysqli_query($GLOBALS['sql_connection'], $sysinfoQuery);
$sysinfojsonBlobsNum = mysqli_num_rows($jsonBlobs); $sysinfojsonBlobsNum = mysqli_num_rows($jsonBlobs);
if ($sysinfojsonBlobsNum != 0) { if ($sysinfojsonBlobsNum != 0) {
//$jsonBlobs = wxc_getMySql($sysinfoQuery); //$jsonBlobs = wxc_getMySql($sysinfoQuery);
//var_dump($jsonBlobs); //var_dump($jsonBlobs);
foreach ($jsonBlobs as $table) { foreach ($jsonBlobs as $table) {
foreach ($table as $table_name) { foreach ($table as $table_name) {
$alterQuery = 'alter table ' . $table_name . ' drop column sysinfo_json'; $alterQuery = 'alter table ' . $table_name . ' drop column sysinfo_json';
wxc_putMySql($alterQuery); wxc_putMySql($alterQuery);
$mesg = "sysinfo_json binary blob removed from database table: " . $table_name . "!"; $mesg = "sysinfo_json binary blob removed from database table: " . $table_name . "!";
wxc_echoWithColor($mesg, "red"); wxc_echoWithColor($mesg, "red");
echo "\n"; echo "\n";
} }
} }
unset($jsonBlobs); unset($jsonBlobs);
unset($sysinfojsonBlobsNum); unset($sysinfojsonBlobsNum);
unset($sysinfoQuery); unset($sysinfoQuery);
wxc_echoWithColor("This is a good thing! It was just taking up space", "green"); wxc_echoWithColor("This is a good thing! It was just taking up space", "green");
echo "\nThis will make the database smaller!\n"; echo "\nThis will make the database smaller!\n";
echo "\n"; echo "\n";
}else { }else {
unset($jsonBlobs); unset($jsonBlobs);
unset($sysinfojsonBlobsNum); unset($sysinfojsonBlobsNum);
unset($sysinfoQuery); unset($sysinfoQuery);
} }
//people use the longest dang names for their nodes!
//it's like they want to make you type for a long time just to get to their node. :)
//$columnNodeNames = mysqli_num_rows(mysqli_query($GLOBALS['sql_connection'], $query)) //people use the longest dang names for their nodes!
$nodeFieldsQuery = "select table_name from information_schema.columns where table_schema = '" . //it's like they want to make you type for a long time just to get to their node. :)
$GLOBALS['USER_SETTINGS']['sql_db'] . "' and column_name = 'node' and character_maximum_length <= 69";
$nodeFields = mysqli_query($GLOBALS['sql_connection'], $nodeFieldsQuery); //$columnNodeNames = mysqli_num_rows(mysqli_query($GLOBALS['sql_connection'], $query))
$nodeFieldsNum = mysqli_num_rows($nodeFields); $nodeFieldsQuery = "select table_name from information_schema.columns where table_schema = '" .
if ($nodeFieldsNum != 0) { $GLOBALS['USER_SETTINGS']['sql_db'] . "' and column_name = 'node' and character_maximum_length <= 69";
foreach ($nodeFields as $table) { $nodeFields = mysqli_query($GLOBALS['sql_connection'], $nodeFieldsQuery);
foreach ($table as $table_name) { $nodeFieldsNum = mysqli_num_rows($nodeFields);
//if ($nodeFields['size'] <= 50) { if ($nodeFieldsNum != 0) {
//echo "\n\nFirst ECHO - Key: " .$key . " Value: " . $value . "\n\n"; foreach ($nodeFields as $table) {
//echo "Table: " . $key['table_name'] . "\n"; foreach ($table as $table_name) {
//echo "size: " . $key['size'] . "\n"; //if ($nodeFields['size'] <= 50) {
wxc_putMySql("alter table $table_name modify column node varchar(70)"); //echo "\n\nFirst ECHO - Key: " .$key . " Value: " . $value . "\n\n";
$mesg = "Altered column \"node\" to hold more characters in table: $table_name!"; //echo "Table: " . $key['table_name'] . "\n";
wxc_echoWithColor($mesg, "green"); //echo "size: " . $key['size'] . "\n";
echo "\n"; wxc_putMySql("alter table $table_name modify column node varchar(70)");
//need to change this one too, it has a different name, but it's the same thing. $mesg = "Altered column \"node\" to hold more characters in table: $table_name!";
if ($table_name == "topology") { wxc_echoWithColor($mesg, "green");
wxc_putMySql("alter table topology modify column linkto varchar(70)"); echo "\n";
$mesg = "... also altered column \"linkto\" to hold more characters in table: $table_name!"; //need to change this one too, it has a different name, but it's the same thing.
wxc_echoWithColor($mesg, "orange"); if ($table_name == "topology") {
echo "\n"; wxc_putMySql("alter table topology modify column linkto varchar(70)");
} $mesg = "... also altered column \"linkto\" to hold more characters in table: $table_name!";
//} wxc_echoWithColor($mesg, "orange");
} echo "\n";
} }
echo "\n"; //}
unset($nodeFields); }
unset($nodeFieldsQuery); }
unset($nodeFieldsNum); echo "\n";
}else { unset($nodeFields);
unset($nodeFields); unset($nodeFieldsQuery);
unset($nodeFieldsQuery); unset($nodeFieldsNum);
unset($nodeFieldsNum); }else {
} unset($nodeFields);
//Just like above (and for the same reasons) unset($nodeFieldsQuery);
//there are 1 or 2 columns called "name" that are used also unset($nodeFieldsNum);
//This will also allow for longer names in the non-mesh markers area }
$nameFieldsQuery = "select table_name from information_schema.columns where table_schema = '" .
$GLOBALS['USER_SETTINGS']['sql_db'] . "' and column_name = 'name' and character_maximum_length <= 69"; //Just like above (and for the same reasons)
$nameFields = mysqli_query($GLOBALS['sql_connection'], $nameFieldsQuery); //there are 1 or 2 columns called "name" that are used also
$nameFieldsNum = mysqli_num_rows($nameFields); //This will also allow for longer names in the non-mesh markers area
if ($nameFieldsNum != 0){ $nameFieldsQuery = "select table_name from information_schema.columns where table_schema = '" .
foreach ($nameFields as $table) { $GLOBALS['USER_SETTINGS']['sql_db'] . "' and column_name = 'name' and character_maximum_length <= 69";
foreach ($table as $table_name) { $nameFields = mysqli_query($GLOBALS['sql_connection'], $nameFieldsQuery);
//if ($nameFields['size'] <= 50) { $nameFieldsNum = mysqli_num_rows($nameFields);
if ($table_name == "marker_info") { if ($nameFieldsNum != 0){
//$query = ; foreach ($nameFields as $table) {
wxc_putMySql("alter table $table_name modify column name varchar(128)"); foreach ($table as $table_name) {
$mesg = "Altered column \"name\" to hold more characters in table: $table_name!"; //if ($nameFields['size'] <= 50) {
wxc_echoWithColor($mesg, "green"); if ($table_name == "marker_info") {
echo "\n"; //$query = ;
}else { wxc_putMySql("alter table $table_name modify column name varchar(128)");
wxc_putMySql("alter table $table_name modify column name varchar(70)"); $mesg = "Altered column \"name\" to hold more characters in table: $table_name!";
$mesg = "Altered column \"name\" to hold more characters in table: $table_name!"; wxc_echoWithColor($mesg, "green");
wxc_echoWithColor($mesg, "green"); echo "\n";
echo "\n"; }else {
} wxc_putMySql("alter table $table_name modify column name varchar(70)");
//} $mesg = "Altered column \"name\" to hold more characters in table: $table_name!";
} wxc_echoWithColor($mesg, "green");
} echo "\n";
echo "\n"; }
unset($nameFields); //}
unset($nameFieldsQuery); }
unset($nameFieldsNum); }
}else { echo "\n";
unset($nameFields); unset($nameFields);
unset($nameFieldsQuery); unset($nameFieldsQuery);
unset($nameFieldsNum); unset($nameFieldsNum);
} }else {
unset($nameFields);
//new columns in the main database table unset($nameFieldsQuery);
//these new columns are for the additions to the sysinfo.json file unset($nameFieldsNum);
//that are in the newer AREDN firmware builds. }
//this might be only the beginning for these
$newColumns1dot2 = mysqli_num_rows(mysqli_query($GLOBALS['sql_connection'], //new columns in the main database table
"show columns from " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " where field='uptime'")); //these new columns are for the additions to the sysinfo.json file
if ($newColumns1dot2 == 0) { //that are in the newer AREDN firmware builds.
wxc_putMySql("alter table " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " add column uptime varchar(50) after last_seen"); //this might be only the beginning for these
wxc_putMySql("alter table " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " add column loadavg varchar(128) after uptime"); $newColumns1dot2 = mysqli_num_rows(mysqli_query($GLOBALS['sql_connection'],
$mesg = "Added new columns to " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " for api_version 1.2"; "show columns from " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " where field='uptime'"));
wxc_echoWithColor($mesg, "green"); if ($newColumns1dot2 == 0) {
echo "\n"; wxc_putMySql("alter table " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " add column uptime varchar(50) after last_seen");
} wxc_putMySql("alter table " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " add column loadavg varchar(128) after uptime");
$mesg = "Added new columns to " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " for api_version 1.2";
$newColumns1dot2 = mysqli_num_rows(mysqli_query($GLOBALS['sql_connection'], wxc_echoWithColor($mesg, "green");
"show columns from removed_nodes where field='uptime'")); echo "\n";
if ($newColumns1dot2 == 0) { }
wxc_putMySql("alter table removed_nodes add column uptime varchar(50) after last_seen");
wxc_putMySql("alter table removed_nodes add column loadavg varchar(128) after uptime"); $newColumns1dot2 = mysqli_num_rows(mysqli_query($GLOBALS['sql_connection'],
$mesg = "Added new columns to removed_nodes for api_version 1.2"; "show columns from removed_nodes where field='uptime'"));
wxc_echoWithColor($mesg, "green"); if ($newColumns1dot2 == 0) {
echo "\n\n"; wxc_putMySql("alter table removed_nodes add column uptime varchar(50) after last_seen");
} wxc_putMySql("alter table removed_nodes add column loadavg varchar(128) after uptime");
$mesg = "Added new columns to removed_nodes for api_version 1.2";
$newColumns1dot3 = mysqli_num_rows(mysqli_query($GLOBALS['sql_connection'], wxc_echoWithColor($mesg, "green");
"show columns from " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " where field='services'")); echo "\n\n";
if ($newColumns1dot3 == 0) { }
wxc_putMySql("alter table " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " add column services varchar(2048) after lan_ip");
$mesg = "Added new columns to " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " for api_version 1.3"; $newColumns1dot3 = mysqli_num_rows(mysqli_query($GLOBALS['sql_connection'],
wxc_echoWithColor($mesg, "green"); "show columns from " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " where field='services'"));
echo "\n"; if ($newColumns1dot3 == 0) {
} wxc_putMySql("alter table " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " add column services varchar(2048) after lan_ip");
$mesg = "Added new columns to " . $GLOBALS['USER_SETTINGS']['sql_db_tbl_node'] . " for api_version 1.3";
$newColumns1dot3 = mysqli_num_rows(mysqli_query($GLOBALS['sql_connection'], wxc_echoWithColor($mesg, "green");
"show columns from removed_nodes where field='services'")); echo "\n";
if ($newColumns1dot3 == 0) { }
wxc_putMySql("alter table removed_nodes add column services varchar(2048) after lan_ip");
$mesg = "Added new columns to removed_nodes for api_version 1.3"; $newColumns1dot3 = mysqli_num_rows(mysqli_query($GLOBALS['sql_connection'],
wxc_echoWithColor($mesg, "green"); "show columns from removed_nodes where field='services'"));
echo "\n\n"; if ($newColumns1dot3 == 0) {
} wxc_putMySql("alter table removed_nodes add column services varchar(2048) after lan_ip");
unset($newColumns1dot2); $mesg = "Added new columns to removed_nodes for api_version 1.3";
unset($newColumns1dot3); wxc_echoWithColor($mesg, "green");
echo "\n\n";
}
unset($newColumns1dot2);
unset($newColumns1dot3);
//check for old trigger based on miles and update to new trigger based on kilometers.
//the conversion to miles will be done later in the code.
$oldDistanceTriggerQuery = "select action_statement from information_schema.triggers where action_statement like '%3959%'";
if ($oldDistanceTriggerQuery) {
$sql = "drop trigger topology_get_latlons_brg_dist";
wxc_putMySql($sql);
$sql = "CREATE TRIGGER `topology_get_latlons_brg_dist` BEFORE INSERT ON `topology` FOR EACH ROW BEGIN
-- get locations and names for each end of the link
IF NEW.node IS NOT NULL THEN
SET NEW.nodelat = (SELECT lat FROM node_info WHERE wlan_ip = NEW.node AND (lat IS NOT NULL && lat != 0 && lat != 0.00));
SET NEW.nodelon = (SELECT lon FROM node_info WHERE wlan_ip = NEW.node AND (lon IS NOT NULL && lon != 0 && lon != 0.00));
SET NEW.node = (SELECT node FROM node_info WHERE wlan_ip = NEW.node);
END IF;
IF NEW.linkto IS NOT NULL THEN
SET NEW.linklat = (SELECT lat FROM node_info WHERE wlan_ip = NEW.linkto AND (lat IS NOT NULL && lat != 0 && lat != 0.00));
SET NEW.linklon = (SELECT lon FROM node_info WHERE wlan_ip = NEW.linkto AND (lon IS NOT NULL && lon != 0 && lon != 0.00));
SET NEW.linkto = (SELECT node FROM node_info WHERE wlan_ip = NEW.linkto);
END IF;
-- figure out distance and bearing
SET NEW.bearing = round(mod(degrees(atan2(sin(radians(NEW.linklon)-radians(NEW.nodelon))*cos(radians(NEW.linklat)), cos(radians(NEW.nodelat))*sin(radians(NEW.linklat))-sin(radians(NEW.nodelat))*cos(radians(NEW.linklat))*cos(radians(NEW.linklon)-radians(NEW.nodelon)))) + 360,360),1);
SET NEW.distance = round(2*asin(sqrt(pow(sin((radians(NEW.linklat)-radians(NEW.nodelat))/2),2)+cos(radians(NEW.nodelat))*cos(radians(NEW. linklat))*pow(sin((radians(NEW.linklon)-radians(NEW.nodelon))/2),2)))*6371,2);
END;";
wxc_putMySql($sql);
unset($oldDistanceTriggerQuery);
unset($sql);
$mesg = "Changed database to have default distance in Kilometers.";
wxc_echoWithColor($mesg, "green");
echo "\n\n";
}
} }
?> ?>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment