--- sql/sqlite/parser3sqlite.C	2010/10/27 22:48:51	1.11
+++ sql/sqlite/parser3sqlite.C	2019/10/24 11:23:36	1.15
@@ -3,7 +3,7 @@
 
 	(c) Dmitry "Creator" Bobrik, 2004
 */
-//static const char *RCSId="$Id: parser3sqlite.C,v 1.11 2010/10/27 22:48:51 moko Exp $"; 
+//static const char *RCSId="$Id: parser3sqlite.C,v 1.15 2019/10/24 11:23:36 moko Exp $"; 
 
 #include "config_includes.h"
 
@@ -14,7 +14,6 @@
 #include "sqlite3.h"
 #include "ltdl.h"
 
-#define MAX_COLS   500
 #define MAX_STRING 0x400
 #define MAX_NUMBER 20
 
@@ -55,6 +54,7 @@ struct Connection {
 	const char* client_charset;
 	bool multi_statements;
 	bool autocommit;
+	int busy_timeout;
 };
 
 
@@ -95,9 +95,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 +128,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 +162,8 @@ public:
 			_throw(connection, error_msg);
 		}
 		
+		sqlite3_busy_timeout(connection.handle, connection.busy_timeout);
+		
 		_begin_transaction(connection);
 	}
 
@@ -257,9 +260,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;
@@ -281,7 +284,7 @@ public:
 			}
 			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.");
+				_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; }
@@ -291,12 +294,6 @@ public:
 			if(!column_count){ // empty result: insert|delete|update|...
 				rc=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; i<column_count; i++){
 					const char *column_name=sqlite3_column_name(SQL, i);
 					size_t length=strlen(column_name);
@@ -318,7 +315,6 @@ public:
 
 				const char *str;
 				size_t length=0;
-				bool first_row=true;
 
 				do{
 					rc=sqlite3_step(SQL);
@@ -327,22 +323,10 @@ public:
 						CHECK(handlers.add_row(sql_error));
 
 						for(int i=0; i<column_count; i++){
-							if(first_row){
-								column_types[i]=sqlite3_column_type(SQL, i);
-								switch(column_types[i]){
-									case SQLITE_INTEGER:
-									case SQLITE_FLOAT:
-									case SQLITE_NULL:
-										transcode_column[i]=false;
-										break;
-									default:
-										transcode_column[i]=transcode_needed;
-										break;
-								}
-							}
-
 							// SQLite allow to get value of any type using sqlite3_column_text function
-							switch(column_types[i]){
+							bool transcode_value=false;
+							int column_type=sqlite3_column_type(SQL, i);
+							switch(column_type){
 								case SQLITE_NULL:
 									length=0;
 									str=NULL;
@@ -351,7 +335,11 @@ public:
 									str=(const char*)sqlite3_column_blob(SQL, i);
 									length=(size_t)sqlite3_column_bytes(SQL, i);
 									break;
+								case SQLITE_TEXT: // for text transcoding can be required
 								default: // anything else?
+									transcode_value=transcode_needed;
+								case SQLITE_INTEGER:
+								case SQLITE_FLOAT:
 									str=(const char*)sqlite3_column_text(SQL, i);
 									length=(size_t)sqlite3_column_bytes(SQL, i);
 									break;
@@ -359,10 +347,11 @@ public:
 
 							if(length){
 								char* strm=(char*)services.malloc_atomic(length+1);
-								memcpy(strm, str, length+1);
+								memcpy(strm, str, length);
+								strm[length]=0;
 								str=strm;
 
-								if(transcode_column[i]){
+								if(transcode_value){
 									// transcode cell value from ?ClientCharset to $request:charset
 									services.transcode(str, length,
 										str, length,
@@ -375,7 +364,6 @@ public:
 							CHECK(handlers.add_row_cell(sql_error, str, length));
 
 						}
-						first_row=false;
 					}
 				} while(rc==SQLITE_BUSY || rc==SQLITE_ROW);
 
@@ -438,6 +426,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;
@@ -466,13 +456,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";
 		}
 
@@ -486,6 +480,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);