sql/sqlite/parser3sqlite.C - diff

Return to parser3sqlite.C CVS log

Up to [parser3project] / sql / sqlite

Diff for /sql/sqlite/parser3sqlite.C between versions 1.12 and 1.16

version 1.12, 2012/04/19 21:33:08	version 1.16, 2019/11/30 21:51:35
Line 3	Line 3

(c) Dmitry "Creator" Bobrik, 2004	(c) Dmitry "Creator" Bobrik, 2004
*/	*/
//static const char *RCSId="$Id$";

#include "config_includes.h"	#include "config_includes.h"

#include "pa_sql_driver.h"	#include "pa_sql_driver.h"
//#include "windows.h" // for messagebox
	volatile const char * IDENT_PARSER3SQLITE_C="$Id$" IDENT_PA_SQL_DRIVER_H;

#define NO_CLIENT_LONG_LONG	#define NO_CLIENT_LONG_LONG
#include "sqlite3.h"	#include "sqlite3.h"
#include "ltdl.h"	#include "ltdl.h"

#define MAX_COLS 500
#define MAX_STRING 0x400	#define MAX_STRING 0x400
#define MAX_NUMBER 20	#define MAX_NUMBER 20

Line 285 public:	Line 284 public:
}	}
if(!connection.multi_statements && next_statement_length>0){ // multi statements was not allowed but pzTail point to not empty one	if(!connection.multi_statements && next_statement_length>0){ // multi statements was not allowed but pzTail point to not empty one
//sqlite3_free((char*)pzTail);	//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; }	#define CHECK(afailed) if(afailed){ failed=true; goto cleanup; }
Line 295 public:	Line 294 public:
if(!column_count){ // empty result: insert\|delete\|update\|...	if(!column_count){ // empty result: insert\|delete\|update\|...
rc=sqlite3_step(SQL);	rc=sqlite3_step(SQL);
} else {	} 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++){	for(int i=0; i<column_count; i++){
const char *column_name=sqlite3_column_name(SQL, i);	const char *column_name=sqlite3_column_name(SQL, i);
size_t length=strlen(column_name);	size_t length=strlen(column_name);
Line 322 public:	Line 315 public:

const char *str;	const char *str;
size_t length=0;	size_t length=0;
bool first_row=true;

do{	do{
rc=sqlite3_step(SQL);	rc=sqlite3_step(SQL);
Line 331 public:	Line 323 public:
CHECK(handlers.add_row(sql_error));	CHECK(handlers.add_row(sql_error));

for(int i=0; i<column_count; i++){	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	// 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:	case SQLITE_NULL:
length=0;	length=0;
str=NULL;	str=NULL;
Line 355 public:	Line 335 public:
str=(const char*)sqlite3_column_blob(SQL, i);	str=(const char*)sqlite3_column_blob(SQL, i);
length=(size_t)sqlite3_column_bytes(SQL, i);	length=(size_t)sqlite3_column_bytes(SQL, i);
break;	break;
	case SQLITE_TEXT: // for text transcoding can be required
default: // anything else?	default: // anything else?
	transcode_value=transcode_needed;
	case SQLITE_INTEGER:
	case SQLITE_FLOAT:
str=(const char*)sqlite3_column_text(SQL, i);	str=(const char*)sqlite3_column_text(SQL, i);
length=(size_t)sqlite3_column_bytes(SQL, i);	length=(size_t)sqlite3_column_bytes(SQL, i);
break;	break;
Line 363 public:	Line 347 public:

if(length){	if(length){
char* strm=(char*)services.malloc_atomic(length+1);	char* strm=(char*)services.malloc_atomic(length+1);
memcpy(strm, str, length+1);	memcpy(strm, str, length);
	strm[length]=0;
str=strm;	str=strm;

if(transcode_column[i]){	if(transcode_value){
// transcode cell value from ?ClientCharset to $request:charset	// transcode cell value from ?ClientCharset to $request:charset
services.transcode(str, length,	services.transcode(str, length,
str, length,	str, length,
Line 379 public:	Line 364 public:
CHECK(handlers.add_row_cell(sql_error, str, length));	CHECK(handlers.add_row_cell(sql_error, str, length));

}	}
first_row=false;
}	}
} while(rc==SQLITE_BUSY \|\| rc==SQLITE_ROW);	} while(rc==SQLITE_BUSY \|\| rc==SQLITE_ROW);

Line 472 private: // sqlite client library funcs	Line 456 private: // sqlite client library funcs
private: // sqlite client library funcs linking	private: // sqlite client library funcs linking

const char dlink(const char dlopen_file_spec) {	const char dlink(const char dlopen_file_spec) {
if(lt_dlinit())	if(lt_dlinit()){
return lt_dlerror();	if(const char* result=lt_dlerror())
lt_dlhandle handle=lt_dlopen(dlopen_file_spec);	return result;
if (!handle) {	return "can not prepare to dynamic loading";
if(const char* result=lt_dlerror())	}
return result;
	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";	return "can not open the dynamic link module";
}	}

E-mail:

Removed from v.1.12
changed lines
	Added in v.1.16