--- sql/sqlite/parser3sqlite.C 2008/07/03 07:17:25 1.9 +++ sql/sqlite/parser3sqlite.C 2021/02/01 18:44:13 1.17 @@ -3,18 +3,17 @@ (c) Dmitry "Creator" Bobrik, 2004 */ -//static const char *RCSId="$Id: parser3sqlite.C,v 1.9 2008/07/03 07:17:25 misha Exp $"; #include "config_includes.h" #include "pa_sql_driver.h" -//#include "windows.h" // for messagebox + +volatile const char * IDENT_PARSER3SQLITE_C="$Id: parser3sqlite.C,v 1.17 2021/02/01 18:44:13 moko Exp $" IDENT_PA_SQL_DRIVER_H; #define NO_CLIENT_LONG_LONG #include "sqlite3.h" #include "ltdl.h" -#define MAX_COLS 500 #define MAX_STRING 0x400 #define MAX_NUMBER 20 @@ -55,9 +54,40 @@ struct Connection { const char* client_charset; bool multi_statements; bool autocommit; + int busy_timeout; }; +// sqlite client library funcs + +typedef int (*t_sqlite3_open)(const char *filename, sqlite3 **ppDb); t_sqlite3_open pa_sqlite3_open; + +typedef int (*t_sqlite3_close)(sqlite3 *); t_sqlite3_close pa_sqlite3_close; + +typedef int (*t_sqlite3_busy_timeout)(sqlite3*, int ms); t_sqlite3_busy_timeout pa_sqlite3_busy_timeout; + +typedef int (*t_sqlite3_exec)(sqlite3*, const char *sql, sqlite3_callback, void *, char **errmsg); t_sqlite3_exec pa_sqlite3_exec; + +typedef void (*t_sqlite3_free)(char *z); t_sqlite3_free pa_sqlite3_free; + +typedef const char *(* t_sqlite3_errmsg)(sqlite3*); t_sqlite3_errmsg pa_sqlite3_errmsg; + +typedef int (* t_sqlite3_prepare)(sqlite3 *db, const char *zSql, int nBytes, sqlite3_stmt **ppStmt, const char **pzTail); t_sqlite3_prepare pa_sqlite3_prepare; + +typedef int (* t_sqlite3_column_count)(sqlite3_stmt *pStmt); t_sqlite3_column_count pa_sqlite3_column_count; + +typedef int (* t_sqlite3_finalize)(sqlite3_stmt *pStmt); t_sqlite3_finalize pa_sqlite3_finalize; + +typedef const char *(* t_sqlite3_column_name)(sqlite3_stmt*,int); t_sqlite3_column_name pa_sqlite3_column_name; + +typedef int (* t_sqlite3_step)(sqlite3_stmt*); t_sqlite3_step pa_sqlite3_step; +typedef int (* t_sqlite3_column_type)(sqlite3_stmt*, int iCol); t_sqlite3_column_type pa_sqlite3_column_type; + +typedef const unsigned char *(* t_sqlite3_column_text)(sqlite3_stmt*, int iCol); t_sqlite3_column_text pa_sqlite3_column_text; + +typedef const unsigned char *(* t_sqlite3_column_blob)(sqlite3_stmt*, int iCol); t_sqlite3_column_blob pa_sqlite3_column_blob; + +typedef int (* t_sqlite3_column_bytes)(sqlite3_stmt*, int iCol); t_sqlite3_column_bytes pa_sqlite3_column_bytes; /** SQLite server driver @@ -95,9 +125,10 @@ public: *connection_ref=&connection; connection.services=&services; - connection.client_charset=SQLITE_DEFAULT_CHARSET; + connection.client_charset=SQLITE_DEFAULT_CHARSET; connection.multi_statements=false; connection.autocommit=true; + connection.busy_timeout=4000; char* db_path=0; char* db=url; @@ -127,14 +158,14 @@ public: if(strcasecmp(key, "multi_statements")==0){ if(atoi(value)!=0) connection.multi_statements=true; + } else if(strcasecmp(key, "busy_timeout")==0){ + connection.busy_timeout=atoi(value); } else if(strcasecmp(key, "autocommit")==0){ if(atoi(value)==0) connection.autocommit=false; - continue; } else if(strcmp(key, "ClientCharset")==0){ toupper_str(value, value, strlen(value)); connection.client_charset=value; - continue; } else services._throw("unknown connect option" /*key*/); } else @@ -154,19 +185,21 @@ public: } - int rc=sqlite3_open(db_path, &connection.handle); + int rc=pa_sqlite3_open(db_path, &connection.handle); if(rc!=SQLITE_OK){ - const char* error_msg=sqlite3_errmsg(connection.handle); - sqlite3_close(connection.handle); + const char* error_msg=pa_sqlite3_errmsg(connection.handle); + pa_sqlite3_close(connection.handle); _throw(connection, error_msg); } + pa_sqlite3_busy_timeout(connection.handle, connection.busy_timeout); + _begin_transaction(connection); } void disconnect(void *aconnection){ Connection& connection=*static_cast(aconnection); - sqlite3_close(connection.handle); + pa_sqlite3_close(connection.handle); connection.handle=0; } @@ -190,23 +223,33 @@ public: return true; // not needed } - const char* quote(void *aconnection, const char *from, unsigned int length){ + // charset here is services.request_charset(), not connection.client_charset + // thus we can't use the sql server quoting support + const char* quote(void *aconnection, const char *str, unsigned int length) + { + const char* from; + const char* from_end=str+length; + + size_t quoted=0; + + for(from=str; from(aconnection); - /* - You must allocate the to buffer to be at least length*2+1 bytes long. - In the worse case, each character may need to be encoded as using two bytes, - and you need room for the terminating null byte. - */ - char *result=(char*)connection.services->malloc_atomic(length*2+1); - char *to=result; - while(length--) { - if(*from=='\'') { // ' -> '' - *to++='\''; - } else if(*from=='\"') { // " -> "" - *to++='\"'; - } - *to++=*from++; + char *result=(char*)connection.services->malloc_atomic(length + quoted + 1); + char *to = result; + + for(from=str; from '' + *to++=*from; } + *to=0; return result; } @@ -247,9 +290,9 @@ public: cur+=statement_size; cur+=sprintf(cur, " LIMIT "); if(offset) - cur+=snprintf(cur, MAX_NUMBER+1, "%u,", offset); + cur+=snprintf(cur, MAX_NUMBER+1, "%lu,", offset); if(limit!=SQL_NO_LIMIT) - cur+=snprintf(cur, MAX_NUMBER, "%u", limit); + cur+=snprintf(cur, MAX_NUMBER, "%lu", limit); statement=statement_limited; } else statement=astatement; @@ -263,32 +306,26 @@ public: bool failed=false; do{ // cycling through SQL commands - rc=sqlite3_prepare(connection.handle, statement, -1, &SQL, &pzTail); + rc=pa_sqlite3_prepare(connection.handle, statement, -1, &SQL, &pzTail); next_statement_length=strlen(pzTail); if(rc!=SQLITE_OK){ - //sqlite3_free((char*)pzTail); - _throw(connection, sqlite3_errmsg(connection.handle)); + //pa_sqlite3_free((char*)pzTail); + _throw(connection, pa_sqlite3_errmsg(connection.handle)); } if(!connection.multi_statements && next_statement_length>0){ // multi statements was not allowed but pzTail point to not empty one - //sqlite3_free((char*)pzTail); - _throw(connection, "multi statements are not allowed until opption ?multi_statements=1 in connect string is specified."); + //pa_sqlite3_free((char*)pzTail); + _throw(connection, "multi statements are not allowed until option ?multi_statements=1 in connect string is specified."); } #define CHECK(afailed) if(afailed){ failed=true; goto cleanup; } - int column_count=sqlite3_column_count(SQL); + int column_count=pa_sqlite3_column_count(SQL); if(!column_count){ // empty result: insert|delete|update|... - rc=sqlite3_step(SQL); + rc=pa_sqlite3_step(SQL); } else { - if(column_count>MAX_COLS) - column_count=MAX_COLS; - - int column_types[MAX_COLS]; - bool transcode_column[MAX_COLS]; - for(int i=0; i0); @@ -393,13 +421,13 @@ private: void _execute_cmd(Connection& connection, const char* statement){ char* zErr; - int rc=sqlite3_exec(connection.handle, statement, 0, 0, &zErr); + int rc=pa_sqlite3_exec(connection.handle, statement, 0, 0, &zErr); if(rc!=SQLITE_OK){ size_t length=strlen(zErr); char* err_msg=(char *)connection.services->malloc_atomic(length+1); memcpy(err_msg, zErr, length); - sqlite3_free(zErr); + pa_sqlite3_free(zErr); _throw(connection, err_msg); } @@ -422,52 +450,25 @@ private: } -private: // sqlite client library funcs - - typedef int (*t_sqlite3_open)(const char *filename, sqlite3 **ppDb); t_sqlite3_open sqlite3_open; - - typedef int (*t_sqlite3_close)(sqlite3 *); t_sqlite3_close sqlite3_close; - - typedef int (*t_sqlite3_exec)(sqlite3*, const char *sql, sqlite3_callback, void *, char **errmsg); t_sqlite3_exec sqlite3_exec; - - typedef void (*t_sqlite3_free)(char *z); t_sqlite3_free sqlite3_free; - - typedef const char *(* t_sqlite3_errmsg)(sqlite3*); t_sqlite3_errmsg sqlite3_errmsg; - - typedef int (* t_sqlite3_prepare)(sqlite3 *db, const char *zSql, int nBytes, sqlite3_stmt **ppStmt, const char **pzTail); t_sqlite3_prepare sqlite3_prepare; - - typedef int (* t_sqlite3_column_count)(sqlite3_stmt *pStmt); t_sqlite3_column_count sqlite3_column_count; - - typedef int (* t_sqlite3_finalize)(sqlite3_stmt *pStmt); t_sqlite3_finalize sqlite3_finalize; - - typedef const char *(* t_sqlite3_column_name)(sqlite3_stmt*,int); t_sqlite3_column_name sqlite3_column_name; - - typedef int (* t_sqlite3_step)(sqlite3_stmt*); t_sqlite3_step sqlite3_step; - - typedef int (* t_sqlite3_column_type)(sqlite3_stmt*, int iCol); t_sqlite3_column_type sqlite3_column_type; - - typedef const unsigned char *(* t_sqlite3_column_text)(sqlite3_stmt*, int iCol); t_sqlite3_column_text sqlite3_column_text; - - typedef const unsigned char *(* t_sqlite3_column_blob)(sqlite3_stmt*, int iCol); t_sqlite3_column_blob sqlite3_column_blob; - - typedef int (* t_sqlite3_column_bytes)(sqlite3_stmt*, int iCol); t_sqlite3_column_bytes sqlite3_column_bytes; - - private: // sqlite client library funcs linking const char *dlink(const char *dlopen_file_spec) { - if(lt_dlinit()) - return lt_dlerror(); - lt_dlhandle handle=lt_dlopen(dlopen_file_spec); - if (!handle) { - if(const char* result=lt_dlerror()) - return result; + if(lt_dlinit()){ + if(const char* result=lt_dlerror()) + return result; + return "can not prepare to dynamic loading"; + } + + lt_dlhandle handle=lt_dlopen(dlopen_file_spec); + if(!handle){ + if(const char* result=lt_dlerror()) + return result; return "can not open the dynamic link module"; } #define DSLINK(name, action) \ - name=(t_##name)lt_dlsym(handle, #name); \ + pa_##name=(t_##name)lt_dlsym(handle, #name); \ if(!name) \ action; @@ -476,6 +477,7 @@ private: // sqlite client library funcs DLINK(sqlite3_open); DLINK(sqlite3_close); + DLINK(sqlite3_busy_timeout); DLINK(sqlite3_exec); DLINK(sqlite3_free); DLINK(sqlite3_errmsg);