mirror of
https://github.com/mangosfour/server.git
synced 2025-12-18 01:37:01 +00:00
Merge branch 'master' into 303
Conflicts: src/game/ObjectMgr.h
This commit is contained in:
commit
233e5eac6f
32 changed files with 160 additions and 68 deletions
|
|
@ -32,9 +32,10 @@
|
|||
#include "Database/Database.h"
|
||||
#include "Database/DatabasePostgre.h"
|
||||
typedef DatabasePostgre DatabaseType;
|
||||
#define _LIKE_ "ILIKE"
|
||||
#define _TABLE_SIM_ "\""
|
||||
#define _LIKE_ "ILIKE"
|
||||
#define _TABLE_SIM_ "\""
|
||||
#define _CONCAT3_(A,B,C) "( " A " || " B " || " C " )"
|
||||
#define _OFFSET_ "LIMIT 1 OFFSET %d"
|
||||
#else
|
||||
#include "Database/QueryResultMysql.h"
|
||||
#include "Database/QueryResultSqlite.h"
|
||||
|
|
@ -42,9 +43,10 @@ typedef DatabasePostgre DatabaseType;
|
|||
#include "Database/DatabaseMysql.h"
|
||||
#include "Database/DatabaseSqlite.h"
|
||||
typedef DatabaseMysql DatabaseType;
|
||||
#define _LIKE_ "LIKE"
|
||||
#define _TABLE_SIM_ "`"
|
||||
#define _LIKE_ "LIKE"
|
||||
#define _TABLE_SIM_ "`"
|
||||
#define _CONCAT3_(A,B,C) "CONCAT( " A " , " B " , " C " )"
|
||||
#define _OFFSET_ "LIMIT %d,1"
|
||||
#endif
|
||||
|
||||
extern DatabaseType WorldDatabase;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue