--- sql/sqlite/parser3sqlite.C	2008/06/27 17:36:30	1.7
+++ sql/sqlite/parser3sqlite.C	2008/07/03 07:17:25	1.9
@@ -3,7 +3,7 @@
 
 	(c) Dmitry "Creator" Bobrik, 2004
 */
-//static const char *RCSId="$Id: parser3sqlite.C,v 1.7 2008/06/27 17:36:30 misha Exp $"; 
+//static const char *RCSId="$Id: parser3sqlite.C,v 1.9 2008/07/03 07:17:25 misha Exp $"; 
 
 #include "config_includes.h"
 
@@ -14,6 +14,7 @@
 #include "sqlite3.h"
 #include "ltdl.h"
 
+#define MAX_COLS   500
 #define MAX_STRING 0x400
 #define MAX_NUMBER 20
 
@@ -78,10 +79,11 @@ public:
 
 	/**	connect
 		@param url
-			format: @b [localhost/]dbfile?
-			autocommit=1&
-			multi_statements=0&
-			ClientCharset=UTF-8
+			format: @b db-file|:memory:|temporary:?
+			autocommit=1&			// =0 disable autocommit. in this case 1 connect == 1 transaction.
+									//	or you can use begin/commit|rollback explicitly
+			multi_statements=0&		// =1 allow many statements in 1 query
+			ClientCharset=UTF-8		// will transcode to/from specified charset instead of UTF-8 (default for sqlite)
 	*/
 	void connect(
 				char *url, 
@@ -101,21 +103,19 @@ public:
 		char* db=url;
 		char* options=lsplit(db, '?');
 
-		if(strcmp(db, ":memory:")==0){ // in-memory table
+		if(strcmp(db, ":memory:")==0){ // in-memory temporary DB
 			db_path=db;
-		} else if(strcmp(db, ":temporary:")==0){ // on disk temporary table (in :memory: style)
+		} else if(strcmp(db, ":temporary:")==0){ // on-disk temporary DB
 			// do nothing: empty path mean temporary table on disk
-		} else { // build path to DB-file from document_root (as anywhere in parser)
-			if(char* document_root=(char*)services.request_document_root()){
-				db_path=(char*)services.malloc_atomic(strlen(document_root)+strlen(db)+1+1);
-				db_path=strncpy(db_path, document_root, MAX_STRING);
-				db_path=strncat(db_path, "/", MAX_STRING);
-			} else {
-				// if document root empty -- build path from executable file
-				db_path=(char*)services.malloc_atomic(strlen(db)+2+1);
-				db_path=strncpy(db_path, "./", MAX_STRING);
-			}
-			db_path=strncat(db_path, db, strlen(db));
+		} else {
+			char* document_root=(char*)services.request_document_root();
+			if(!document_root) // path to DB-file which was specified by user is path from document_root as anywhere in parser
+				services._throw("document_root is empty");
+
+			db_path=(char*)services.malloc_atomic(strlen(document_root)+1+strlen(db)+1);
+			strcpy(db_path, document_root);
+			strcat(db_path, "/");
+			strcat(db_path, db);
 		}
 
 		//services._throw(db_path);
@@ -124,17 +124,14 @@ public:
 			if(char* key=lsplit(&options, '&')){
 				if(*key) {
 					if(char* value=lsplit(key, '=')){
-						if(strcasecmp(key, "multi_statements")==0) {
+						if(strcasecmp(key, "multi_statements")==0){
 							if(atoi(value)!=0)
 								connection.multi_statements=true;
 						} else if(strcasecmp(key, "autocommit")==0){
 							if(atoi(value)==0)
 								connection.autocommit=false;
 							continue;
-						} else if(strcmp(key, "ClientCharset")==0){	// transcoding with parser. 
-												// by default we always transcode to UTF-8 (sqlite default)
-												// so use this option only if you already stored data in your sqlite DB
-												// in wrong encoding (1251 for ex.)
+						} else if(strcmp(key, "ClientCharset")==0){
 							toupper_str(value, value, strlen(value));
 							connection.client_charset=value;
 							continue;
@@ -226,7 +223,9 @@ public:
 
 		if(placeholders_count>0)
 			services._throw("bind variables not supported yet");
-   
+		
+		const char* request_charset=services.request_charset();
+		const char* client_charset=connection.client_charset;
 		bool transcode_needed=_transcode_required(connection);
 
 		// transcode query from $request:charset to ?ClientCharset
@@ -234,8 +233,8 @@ public:
 			size_t length=strlen(astatement);
 			services.transcode(astatement, length,
 				astatement, length,
-				services.request_charset(),
-				connection.client_charset);
+				request_charset,
+				client_charset);
 		}
 		
 		const char *statement;
@@ -267,12 +266,12 @@ public:
 			rc=sqlite3_prepare(connection.handle, statement, -1, &SQL, &pzTail);
 			next_statement_length=strlen(pzTail);
 			if(rc!=SQLITE_OK){
-				sqlite3_free((char*)pzTail);
+				//sqlite3_free((char*)pzTail);
 				_throw(connection, 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 in this connection");
+				//sqlite3_free((char*)pzTail);
+				_throw(connection, "multi statements are not allowed until opption ?multi_statements=1 in connect string is specified.");
 			}
 			
 			#define CHECK(afailed) if(afailed){ failed=true; goto cleanup; }
@@ -282,6 +281,12 @@ 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);
@@ -293,17 +298,17 @@ public:
 					if(transcode_needed){
 						services.transcode(str, length,
 							str, length,
-							connection.client_charset,
-							services.request_charset());
+							client_charset,
+							request_charset);
 					}
 							
 					CHECK(handlers.add_column(sql_error, (const char*)str, length));
 				}
 				CHECK(handlers.before_rows(sql_error));
 
-				int column_type;
 				const char *str;
 				size_t length=0;
+				bool first_row=true;
 
 				do{
 					rc=sqlite3_step(SQL);
@@ -312,10 +317,22 @@ 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
-							column_type=sqlite3_column_type(SQL, i);
-							bool transcode_value=false;
-							switch(column_type){
+							switch(column_types[i]){
 								case SQLITE_NULL:
 									length=0;
 									str=NULL;
@@ -324,11 +341,7 @@ 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
-									transcode_value=transcode_needed;
-								case SQLITE_INTEGER:
-								case SQLITE_FLOAT:
-								default: // what else? may be for future purposes
+								default: // anything else?
 									str=(const char*)sqlite3_column_text(SQL, i);
 									length=(size_t)sqlite3_column_bytes(SQL, i);
 									break;
@@ -339,12 +352,12 @@ public:
 								memcpy(strm, str, length+1);
 								str=strm;
 
-								// transcode cell value from ?ClientCharset to $request:charset 
-								if(transcode_value){
+								if(transcode_column[i]){
+									// transcode cell value from ?ClientCharset to $request:charset
 									services.transcode(str, length,
 										str, length,
-										connection.client_charset,
-										services.request_charset());
+										client_charset,
+										request_charset);
 								}
 							} else
 								str=0;
@@ -352,6 +365,7 @@ public:
 							CHECK(handlers.add_row_cell(sql_error, str, length));
 
 						}
+						first_row=false;
 					}
 				} while(rc==SQLITE_BUSY || rc==SQLITE_ROW);