X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2f4e132c13d2689d6668b24b91bad758729615e..258e5c7427015e93a233c4d1a5d3cd164abbe57c:/include/wx/db.h?ds=sidebyside diff --git a/include/wx/db.h b/include/wx/db.h index 0db9c05184..5848ef0b63 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -124,8 +124,8 @@ extern char const *SQL_CATALOG_FILENAME; // Database Globals const int DB_TYPE_NAME_LEN = 40; -const int DB_MAX_STATEMENT_LEN = 2048; -const int DB_MAX_WHERE_CLAUSE_LEN = 1024; +const int DB_MAX_STATEMENT_LEN = 4096; +const int DB_MAX_WHERE_CLAUSE_LEN = 2048; const int DB_MAX_ERROR_MSG_LEN = 512; const int DB_MAX_ERROR_HISTORY = 5; const int DB_MAX_TABLE_NAME_LEN = 128; @@ -376,7 +376,8 @@ enum wxDBMS dbmsDBASE, dbmsINFORMIX, dbmsVIRTUOSO, - dbmsDB2 + dbmsDB2, + dbmsINTERBASE }; @@ -531,7 +532,7 @@ public: int GetColumnCount(char *tableName, const char *userID=NULL); const char *GetDatabaseName(void) {return dbInf.dbmsName;} const char *GetDataSource(void) {return (const char *)dsn;} - const char *GetDataSourceName(void){return (const char *)dsn;} + const char *GetDatasourceName(void){return (const char *)dsn;} const char *GetUsername(void) {return (const char *)uid;} const char *GetPassword(void) {return (const char *)authStr;} bool IsOpen(void) {return dbIsOpen;} @@ -545,8 +546,8 @@ public: wxDbSqlTypeInfo GetTypeInfDate() {return typeInfDate;} bool TableExists(const char *tableName, const char *userID=NULL, const char *path=NULL); // Table name can refer to a table, view, alias or synonym - bool TablePrivileges(const char *tableName, const char* priv, const char *userID=NULL, const char *path=""); // Table name can refer to a table, view, alias or synonym - void LogError(const char *errMsg, const char *SQLState = 0) {logError(errMsg, SQLState);} + bool TablePrivileges(const char *tableName, const char* priv, const char *userID="", const char *schema=NULL, const char *path=""); // Table name can refer to a table, view, alias or synonym + void LogError(const char *errMsg, const char *SQLState = NULL) {logError(errMsg, SQLState);} void SetDebugErrorMessages(bool state) { silent = !state; } bool SetSqlLogging(wxDbSqlLogState state, const wxChar *filename = SQL_LOG_FILENAME, bool append = FALSE); bool WriteSqlLog(const wxChar *logMsg);