From: Florian G. <re...@us...> - 2006-12-07 23:47:15
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv861/db_tools Modified Files: convert.h convert.c Log Message: Made DropForeignKey working Index: convert.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** convert.c 7 Dec 2006 00:14:03 -0000 1.8 --- convert.c 7 Dec 2006 23:47:13 -0000 1.9 *************** *** 40,174 **** #include <regex.h> ! /* Domain to use: */ #define SERVICE "service" ! void addIdFields(); ! void checkTables(); ! void addTableHostGroup(void); ! void addTableDeletePolicy(void); ! void addTableRegistry(void); [...1218 lines suppressed...] ! void ! addTableRawSummaryData () ! { ! g_string_assign (s_SQL, ! "CREATE TABLE IF NOT EXISTS perfdata_raw_summary_data (" ! "service_id INT NOT NULL ," "epoch INT NOT NULL ," ! "epoch_start INT NOT NULL ," ! "last_ctime INT NOT NULL ," ! "last_nagios_status INT default NULL," ! "count INT NOT NULL ," "sum_uptime INT NOT NULL ," ! "sum_warntime INT NOT NULL ," ! "sum_criticaltime INT NOT NULL ," ! "sum_undeftime INT NOT NULL ," ! "PRIMARY KEY (service_id,epoch,epoch_start)," ! "FOREIGN KEY (service_id, epoch) REFERENCES perfdata_raw_summary (service_id, epoch)" ! ") TYPE=InnoDB"); ! query_no_return (s_SQL->str); } Index: convert.h =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** convert.h 30 Oct 2006 21:35:06 -0000 1.2 --- convert.h 7 Dec 2006 23:47:13 -0000 1.3 *************** *** 31,35 **** void autoConvert(); void install_database(void); ! void DropForeignKey(char *TableName, char *ForeignTableName); #endif --- 31,35 ---- void autoConvert(); void install_database(void); ! int DropForeignKey(char *TableName, char *ForeignTableName); #endif |