+/* mysqlConn.c - NeonServ v5.3
+ * Copyright (C) 2011-2012 Philipp Kreil (pk910)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
#include "mysqlConn.h"
-#define DATABASE_VERSION "1"
+#define DATABASE_VERSION "14"
struct used_result {
MYSQL_RES *result;
version = atoi(row[0]);
}
}
+ printf("%d \n", version);
if(!version) {
//CREATE DATABASE
FILE *f = fopen("database.sql", "r");
int query_buffer_pos = 0;
while (fgets(line, sizeof(line), f)) {
query_buffer_pos += sprintf(query_buffer + query_buffer_pos, " %s", line);
- if(line[(strlen(line) - 1)] == ';') {
- mysql_query(mysql_conn, query_buffer);
+ if(line[(strlen(line) - 2)] == ';') {
+ if(mysql_query(mysql_conn, query_buffer))
+ show_mysql_error();
query_buffer_pos = 0;
}
}
fclose(f);
}
f = fopen("database.defaults.sql", "r");
- mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_ON);
if (f) {
- char line[2048];
- char query_buffer[65536];
+ char line[4096];
+ char query_buffer[131072];
int query_buffer_pos = 0;
while (fgets(line, sizeof(line), f)) {
query_buffer_pos += sprintf(query_buffer + query_buffer_pos, " %s", line);
- if(line[(strlen(line) - 1)] == ';') {
- mysql_query(mysql_conn, query_buffer);
+ if(line[(strlen(line) - 2)] == ';') {
+ if(mysql_query(mysql_conn, query_buffer))
+ show_mysql_error();
query_buffer_pos = 0;
}
}
fclose(f);
}
+ do {
+ MYSQL_RES *res = mysql_store_result(mysql_conn);
+ mysql_free_result(res);
+ } while(!mysql_next_result(mysql_conn));
mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
- mysql_query(mysql_conn, "UPDATE `version` SET `database_version` = '" DATABASE_VERSION "'");
+ mysql_query(mysql_conn, "INSERT INTO `version` (`database_version`) VALUES ('" DATABASE_VERSION "')");
}
else if(version < atoi(DATABASE_VERSION)) {
//UPDATE DATABASE
mysql_query(mysql_conn, query_buffer);
query_buffer_pos = 0;
}
- } else if(!stricmp(query_buffer, line)) {
+ } else if(!stricmplen(query_buffer, line, strlen(query_buffer))) {
use_querys = 1;
}
}
+ if(query_buffer_pos) {
+ if(mysql_query(mysql_conn, query_buffer))
+ show_mysql_error();
+ }
fclose(f);
- }
+ } else
+ perror("database.sql missing!");
+ do {
+ MYSQL_RES *res = mysql_store_result(mysql_conn);
+ mysql_free_result(res);
+ } while(!mysql_next_result(mysql_conn));
mysql_set_server_option(mysql_conn, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
mysql_query(mysql_conn, "UPDATE `version` SET `database_version` = '" DATABASE_VERSION "'");
}
}
}
+void printf_long_mysql_query(int len, const char *text, ...) {
+ va_list arg_list;
+ char queryBuf[len];
+ int pos;
+ queryBuf[0] = '\0';
+ va_start(arg_list, text);
+ pos = vsnprintf(queryBuf, len - 2, text, arg_list);
+ va_end(arg_list);
+ if (pos < 0 || pos > (len - 2)) pos = len - 2;
+ queryBuf[pos] = '\0';
+ printf("MySQL: %s\n", queryBuf);
+ if(mysql_query(mysql_conn, queryBuf)) {
+ check_mysql();
+ if(mysql_query(mysql_conn, queryBuf)) {
+ show_mysql_error();
+ }
+ }
+}
+
char* escape_string(const char *str) {
struct escaped_string *escapedstr = malloc(sizeof(*escapedstr));
if (!escapedstr) {