summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-12-19 16:11:43 +0100
committerHaru <haru@dotalux.com>2016-01-29 10:59:28 +0100
commit9e922317933de98bb25146045ceb56ac4e6d1a24 (patch)
tree51be126e8c8e88a62a94ab7c9e9b5f2fafc08e0d /src
parent84a16afc56aa5a93dae2c83a9b1482ab52e90c31 (diff)
downloadhercules-9e922317933de98bb25146045ceb56ac4e6d1a24.tar.gz
hercules-9e922317933de98bb25146045ceb56ac4e6d1a24.tar.bz2
hercules-9e922317933de98bb25146045ceb56ac4e6d1a24.tar.xz
hercules-9e922317933de98bb25146045ceb56ac4e6d1a24.zip
Changed DB2SQL plugin to not cross-convert databases
- To convert a renewal database, compile the server and plugin as renewal, and to convert a pre-renewal database, compile both as pre-renewal. - This is a necessary evil, for future compatibility. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/db2sql.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c
index abbb42ee0..32df45e84 100644
--- a/src/plugins/db2sql.c
+++ b/src/plugins/db2sql.c
@@ -43,6 +43,12 @@ HPExport struct hplugin_info pinfo = {
HPM_VERSION, // HPM Version (don't change, macro is automatically updated)
};
+#ifdef RENEWAL
+#define DBSUFFIX "_re"
+#else // not RENEWAL
+#define DBSUFFIX ""
+#endif
+
struct {
FILE *fp;
struct {
@@ -336,8 +342,7 @@ void do_db2sql(void)
const char *source;
const char *destination;
} files[] = {
- {"item_db", "re/item_db.conf", "sql-files/item_db_re.sql"},
- {"item_db", "pre-re/item_db.conf", "sql-files/item_db.sql"},
+ {"item_db", DBPATH"item_db.conf", "sql-files/item_db" DBSUFFIX ".sql"},
{"item_db2", "item_db2.conf", "sql-files/item_db2.sql"},
};