Skip to content

Commit

Permalink
Cleaning up some stuff after huge merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@surfrock66
surfrock66 committed Feb 3, 2019
1 parent 43c5aa0 commit 2683973
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 46 deletions.
82 changes: 41 additions & 41 deletions web/db_upgrade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,48 @@
require_once ('db.php');
require_once ('auth_app.php');

mysqli_query($con, "ALTER TABLE $db_keys_table ADD COLUMN favorite TINYINT(1) NOT NULL DEFAULT 0") or die(mysqli_error($con));
// Update existing tables to handle new data structures
$table_list = mysqli_query($con, "SELECT table_name FROM INFORMATION_SCHEMA.tables WHERE table_schema = '$db_name' and table_name like '$db_table%' ORDER BY table_name DESC;");
while( $row = mysqli_fetch_assoc($table_list) ) {
$db_table_name = $row["table_name"];
// Change the GPS Latitude and Longitude datapoints from Float to Double to improve accuracy
$sqlLatQuery = "ALTER TABLE $db_table_name MODIFY kff1006 DOUBLE NOT NULL DEFAULT '0'";
mysqli_query($con, $sqlLatQuery) or die(mysqli_error($con));
$sqlLongQuery = "ALTER TABLE $db_table_name MODIFY kff1005 DOUBLE NOT NULL DEFAULT '0'";
mysqli_query($con, $sqlLongQuery) or die(mysqli_error($con));
// Delete columns which are now redundant and just stored with the session
$sqlVQuery = "ALTER TABLE $db_table_name DROP COLUMN v";
mysqli_query($con, $sqlVQuery) or die(mysqli_error($con));
$sqlIdQuery = "ALTER TABLE $db_table_name DROP COLUMN id";
mysqli_query($con, $sqlIdQuery) or die(mysqli_error($con));
$sqlEmlQuery = "ALTER TABLE $db_table_name DROP COLUMN eml";
mysqli_query($con, $sqlEmlQuery) or die(mysqli_error($con));
$sqlProfileNameQuery = "ALTER TABLE $db_table_name DROP COLUMN profileName";
mysqli_query($con, $sqlProfileNameQuery) or die(mysqli_error($con));
$sqlProfileFuelTypeQuery = "ALTER TABLE $db_table_name DROP COLUMN profileFuelType";
mysqli_query($con, $sqlProfileFuelTypeQuery) or die(mysqli_error($con));
$sqlProfileWeightQuery = "ALTER TABLE $db_table_name DROP COLUMN profileWeight";
mysqli_query($con, $sqlProfileWeightQuery) or die(mysqli_error($con));
$sqlProfileVeQuery = "ALTER TABLE $db_table_name DROP COLUMN profileVe";
mysqli_query($con, $sqlProfileVeQuery) or die(mysqli_error($con));
$sqlProfileFuelCostQuery = "ALTER TABLE $db_table_name DROP COLUMN profileFuelCost";
mysqli_query($con, $sqlProfileFuelCostQuery) or die(mysqli_error($con));

}
# mysqli_query($con, "ALTER TABLE $db_keys_table ADD COLUMN favorite TINYINT(1) NOT NULL DEFAULT 0") or die(mysqli_error($con));
# // Update existing tables to handle new data structures
# $table_list = mysqli_query($con, "SELECT table_name FROM INFORMATION_SCHEMA.tables WHERE table_schema = '$db_name' and table_name like '$db_table%' ORDER BY table_name DESC;");
# while( $row = mysqli_fetch_assoc($table_list) ) {
# $db_table_name = $row["table_name"];
# // Change the GPS Latitude and Longitude datapoints from Float to Double to improve accuracy
# $sqlLatQuery = "ALTER TABLE $db_table_name MODIFY kff1006 DOUBLE NOT NULL DEFAULT '0'";
# mysqli_query($con, $sqlLatQuery) or die(mysqli_error($con));
# $sqlLongQuery = "ALTER TABLE $db_table_name MODIFY kff1005 DOUBLE NOT NULL DEFAULT '0'";
# mysqli_query($con, $sqlLongQuery) or die(mysqli_error($con));
# // Delete columns which are now redundant and just stored with the session
# $sqlVQuery = "ALTER TABLE $db_table_name DROP COLUMN v";
# mysqli_query($con, $sqlVQuery) or die(mysqli_error($con));
# $sqlIdQuery = "ALTER TABLE $db_table_name DROP COLUMN id";
# mysqli_query($con, $sqlIdQuery) or die(mysqli_error($con));
# $sqlEmlQuery = "ALTER TABLE $db_table_name DROP COLUMN eml";
# mysqli_query($con, $sqlEmlQuery) or die(mysqli_error($con));
# $sqlProfileNameQuery = "ALTER TABLE $db_table_name DROP COLUMN profileName";
# mysqli_query($con, $sqlProfileNameQuery) or die(mysqli_error($con));
# $sqlProfileFuelTypeQuery = "ALTER TABLE $db_table_name DROP COLUMN profileFuelType";
# mysqli_query($con, $sqlProfileFuelTypeQuery) or die(mysqli_error($con));
# $sqlProfileWeightQuery = "ALTER TABLE $db_table_name DROP COLUMN profileWeight";
# mysqli_query($con, $sqlProfileWeightQuery) or die(mysqli_error($con));
# $sqlProfileVeQuery = "ALTER TABLE $db_table_name DROP COLUMN profileVe";
# mysqli_query($con, $sqlProfileVeQuery) or die(mysqli_error($con));
# $sqlProfileFuelCostQuery = "ALTER TABLE $db_table_name DROP COLUMN profileFuelCost";
# mysqli_query($con, $sqlProfileFuelCostQuery) or die(mysqli_error($con));
#
# }

// Split the raw logs table into per-month tables
$sessionYears = mysqli_query($con, "SELECT DISTINCT CONCAT(YEAR(FROM_UNIXTIME(session/1000)), '_', DATE_FORMAT(FROM_UNIXTIME(session/1000),'%m')) as Suffix, YEAR(FROM_UNIXTIME(session/1000)) as Year, MONTH(FROM_UNIXTIME(session/1000)) as Month FROM $db_table");
while( $row = mysqli_fetch_assoc( $sessionYears ) ) {
$suffix = $row['Suffix'];
$year = $row['Year'];
$month = $row['Month'];
$new_table_name = "{$db_table}_test_{$suffix}";
$table_create_query = "CREATE TABLE $new_table_name SELECT * FROM $db_table WHERE YEAR(FROM_UNIXTIME(session/1000)) LIKE '$year' and MONTH(FROM_UNIXTIME(session/1000)) LIKE '$month'";
mysqli_query($con, $table_create_query) or die(mysqli_error($con));
}
# // Split the raw logs table into per-month tables
# $sessionYears = mysqli_query($con, "SELECT DISTINCT CONCAT(YEAR(FROM_UNIXTIME(session/1000)), '_', DATE_FORMAT(FROM_UNIXTIME(session/1000),'%m')) as Suffix, YEAR(FROM_UNIXTIME(session/1000)) as Year, MONTH(FROM_UNIXTIME(session/1000)) as Month FROM $db_table");
# while( $row = mysqli_fetch_assoc( $sessionYears ) ) {
# $suffix = $row['Suffix'];
# $year = $row['Year'];
# $month = $row['Month'];
# $new_table_name = "{$db_table}_test_{$suffix}";
# $table_create_query = "CREATE TABLE $new_table_name SELECT * FROM $db_table WHERE YEAR(FROM_UNIXTIME(session/1000)) LIKE '$year' and MONTH(FROM_UNIXTIME(session/1000)) LIKE '$month'";
# mysqli_query($con, $table_create_query) or die(mysqli_error($con));
# }

// Clear the raw_logs table; we still want it as a shell, just empty
mysqli_query($con, "DELETE FROM $db_table") or die(mysqli_error($con));
# // Clear the raw_logs table; we still want it as a shell, just empty
# mysqli_query($con, "DELETE FROM $db_table") or die(mysqli_error($con));
?>

14 changes: 9 additions & 5 deletions web/pid_commit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,16 @@
}
//update the values
$query = "UPDATE $db_name.$db_keys_table SET ".quote_name($field_name)." = ".quote_value($val)." WHERE id = ".quote_value($id);
echo "\n$query\n";
mysqli_query($con,$query) || die(mysqli_error($con));
//echo "<br />$query<br />";
mysqli_query($con, $query) || die(mysqli_error($con));
if($field_name == 'type') {
$query = "ALTER TABLE $db_name.$db_table MODIFY ".quote_name($id)." ".mysqli_real_escape_string($con, $val)." NOT NULL DEFAULT '0'";
echo $query;
mysqli_query($con,$query) || die(mysqli_error($con));
$table_list = mysqli_query($con, "SELECT table_name FROM INFORMATION_SCHEMA.tables WHERE table_schema = '$db_name' and table_name like '$db_table%' ORDER BY table_name DESC;");
while( $row = mysqli_fetch_assoc($table_list) ) {
$db_table_name = $row["table_name"];
$query = "ALTER TABLE $db_name.$db_table_name MODIFY ".quote_name($id)." ".mysqli_real_escape_string($con, $val)." NOT NULL DEFAULT '0'";
//echo "<br />$query<br />";
mysqli_query($con, $query) || die(mysqli_error($con));
}
}
echo "Updated";
} else {
Expand Down

0 comments on commit 2683973

Please sign in to comment.