48k.eu-mirror
/
ogserver
mirror of https://git.48k.eu/ogserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1037 Simplify database update v3 code 

Simplify database update v3, no need for iteration.

Fixes: 12d8fff (#1037 Add disk type)
master
Javier Sánchez Parra 2021-05-27 09:33:45 +02:00 committed by OpenGnSys Support Team
parent 12d8fff3ef
commit a00eccc767
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/schema.c
View File

@ -180,27 +180,20 @@ err_no_trans:
static int og_dbi_schema_v3(struct og_dbi *dbi) static int og_dbi_schema_v3(struct og_dbi *dbi)
{ {
const char *msglog, *command; const char *msglog;
dbi_result result, result_alter; dbi_result result;
syslog(LOG_DEBUG, "Adding disk type to ordenadores_particiones\n");
result = dbi_conn_query(dbi->conn, result = dbi_conn_query(dbi->conn,
"ALTER TABLE ordenadores_particiones " "ALTER TABLE ordenadores_particiones "
"ADD disk_type VARCHAR(32) DEFAULT NULL " "ADD disk_type VARCHAR(32) DEFAULT NULL "
"AFTER numdisk;"); "AFTER numdisk;");
if (!result) {
while (dbi_result_next_row(result)) {
command = dbi_result_get_string(result, "cmd");
syslog(LOG_DEBUG, "Adding disk type: %s\n", command);
result_alter = dbi_conn_query(dbi->conn, command);
if (!result_alter) {
dbi_conn_error(dbi->conn, &msglog); dbi_conn_error(dbi->conn, &msglog);
syslog(LOG_INFO, "Error when adding disk type (%s:%d) %s\n", syslog(LOG_INFO, "Error when adding disk type (%s:%d) %s\n",
__func__, __LINE__, msglog); __func__, __LINE__, msglog);
return -1; return -1;
} }
dbi_result_free(result_alter);
}
dbi_result_free(result); dbi_result_free(result);
result = dbi_conn_query(dbi->conn, "UPDATE version SET version = 3"); result = dbi_conn_query(dbi->conn, "UPDATE version SET version = 3");