--- sql/sqlite/parser3sqlite.C	2008/07/03 07:17:25	1.9
+++ sql/sqlite/parser3sqlite.C	2012/06/15 09:09:33	1.13
@@ -3,7 +3,7 @@
 
 	(c) Dmitry "Creator" Bobrik, 2004
 */
-//static const char *RCSId="$Id: parser3sqlite.C,v 1.9 2008/07/03 07:17:25 misha Exp $"; 
+//static const char *RCSId="$Id: parser3sqlite.C,v 1.13 2012/06/15 09:09:33 moko Exp $"; 
 
 #include "config_includes.h"
 
@@ -55,6 +55,7 @@ struct Connection {
 	const char* client_charset;
 	bool multi_statements;
 	bool autocommit;
+	int busy_timeout;
 };
 
 
@@ -95,9 +96,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 +129,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 
@@ -161,6 +163,8 @@ public:
 			_throw(connection, error_msg);
 		}
 		
+		sqlite3_busy_timeout(connection.handle, connection.busy_timeout);
+		
 		_begin_transaction(connection);
 	}
 
@@ -190,23 +194,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<from_end; from++){
+			if(*from=='\'')
+				quoted++;
+		}
+
+		if(!quoted)
+			return str;
+
 		Connection& connection=*static_cast<Connection*>(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<from_end; from++){
+			if(*from=='\'')
+				*to++= '\''; // ' -> ''
+			*to++=*from;
 		}
+		
 		*to=0;
 		return result;
 	}
@@ -247,9 +261,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;
@@ -428,6 +442,8 @@ private: // sqlite client library funcs
 
 	typedef int (*t_sqlite3_close)(sqlite3 *); t_sqlite3_close sqlite3_close;
 
+	typedef int (*t_sqlite3_busy_timeout)(sqlite3*, int ms); t_sqlite3_busy_timeout sqlite3_busy_timeout;
+
 	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;
@@ -456,13 +472,17 @@ private: // sqlite client library funcs
 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";
 		}
 
@@ -476,6 +496,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);