sql/pgsql/parser3pgsql.C - diff

Return to parser3pgsql.C CVS log

Up to [parser3project] / sql / pgsql

Diff for /sql/pgsql/parser3pgsql.C between versions 1.34 and 1.39

version 1.34, 2008/12/25 02:33:56	version 1.39, 2012/06/06 14:47:44
Line 1	Line 1
/** @file	/** @file
Parser PgSQL driver.	Parser PgSQL driver.

Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)

Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)

2007.10.25 using PgSQL 8.1.5	2007.10.25 using PgSQL 8.1.5
*/	*/
static const char *RCSId="$Id$";

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

Line 16 static const char *RCSId="$Id$";	Line 15 static const char *RCSId="$Id$";
#include <libpq-fe.h>	#include <libpq-fe.h>
#include <libpq/libpq-fs.h>	#include <libpq/libpq-fs.h>

	volatile const char * IDENT_PARSER3PGSQL_C="$Id$" IDENT_PA_SQL_DRIVER_H;

// from catalog/pg_type.h	// from catalog/pg_type.h
#define BOOLOID 16	#define BOOLOID 16
#define INT8OID 20	#define INT8OID 20
Line 85 static void toupper_str(char *out, const	Line 86 static void toupper_str(char *out, const
out++=(char)toupper(in++);	out++=(char)toupper(in++);
}	}

	inline static const char* strdup(SQL_Driver_services& services, char* str, size_t length) {
	char strm=(char)services.malloc_atomic(length+1);
	memcpy(strm, str, length);
	strm[length]=0;
	return (const char*)strm;
	}

struct Connection {	struct Connection {
SQL_Driver_services* services;	SQL_Driver_services* services;

Line 193 public:	Line 201 public:
}	}

if(charset){	if(charset){
char statement[MAX_STRING]="SET CLIENT_ENCODING=";	char statement[MAX_STRING+1]="SET CLIENT_ENCODING=";
strncat(statement, charset, MAX_STRING);	strncat(statement, charset, MAX_STRING);

_execute_cmd(connection, statement);	_execute_cmd(connection, statement);
Line 232 public:	Line 240 public:
return PQstatus(connection.conn)==CONNECTION_OK;	return PQstatus(connection.conn)==CONNECTION_OK;
}	}

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++){
	switch (*from) {
	case '\'':
	case '\\':
	quoted++;
	}
	}

	if(!quoted)
	return str;

Connection& connection=static_cast<Connection>(aconnection);	Connection& connection=static_cast<Connection>(aconnection);
	char result=(char)connection.services->malloc_atomic(length + quoted + 1);
	char *to = result;

char result=(char)connection.services->malloc_atomic(length*2+1);	for(from=str; from<from_end; from++){
int err=0;	switch (*from) {
PQescapeStringConn(connection.conn, result, from, length, &err);	case '\'': // "'" -> "''"
	*to++='\'';
	break;
	case '\\': // "\" -> "\\"
	*to++='\\';
	break;
	}
	to++=from;
	}

	*to=0;
return result;	return result;
}	}

void query(void *aconnection,	void query(void *aconnection,
const char *astatement,	const char *astatement,
size_t placeholders_count, Placeholder* placeholders,	size_t placeholders_count, Placeholder* placeholders,
Line 262 public:	Line 301 public:
_bind_parameters(placeholders_count, placeholders, paramValues, connection, transcode_needed);	_bind_parameters(placeholders_count, placeholders, paramValues, connection, transcode_needed);
}	}

	size_t statement_size=0;
if(transcode_needed){	if(transcode_needed){
// transcode query from $request:charset to ?ClientCharset	// transcode query from $request:charset to ?ClientCharset
size_t length=strlen(astatement);	statement_size=strlen(astatement);
services.transcode(astatement, length,	services.transcode(astatement, statement_size,
astatement, length,	astatement, statement_size,
request_charset,	request_charset,
client_charset);	client_charset);
}	}

const char *statement=_preprocess_statement(connection, astatement, offset, limit);	const char *statement=_preprocess_statement(connection, astatement, statement_size, offset, limit);
// error after prepare?	// error after prepare?

PGresult *res;	PGresult *res;
Line 308 public:	Line 348 public:
goto cleanup; \	goto cleanup; \
}	}

int column_count=PQnfields(res);	size_t column_count=PQnfields(res);
if(!column_count)	if(!column_count)
PQclear_throw("result contains no columns");	PQclear_throw("result contains no columns");

Line 316 public:	Line 356 public:
column_count=MAX_COLS;	column_count=MAX_COLS;

unsigned int column_types[MAX_COLS];	unsigned int column_types[MAX_COLS];
bool transcode_column[MAX_COLS];

for(int i=0; i<column_count; i++){	for(size_t i=0; i<column_count; i++){
column_types[i]=PQftype(res, i);	column_types[i]=PQftype(res, i);
switch(column_types[i]){
case BOOLOID:
case INT8OID:
case INT2OID:
case INT4OID:
case FLOAT4OID:
case FLOAT8OID:
case DATEOID:
case TIMEOID:
case TIMESTAMPOID:
case TIMESTAMPTZOID:
case TIMETZOID:
case NUMERICOID:
transcode_column[i]=false;
break;
default:
transcode_column[i]=transcode_needed;
break;
}
char *name=PQfname(res, i);	char *name=PQfname(res, i);
size_t length=strlen(name);	size_t length=strlen(name);
char* strm=(char*)services.malloc(length+1);	const char* str=strdup(services, name, length);
memcpy(strm, name, length+1);
const char* str=strm;

if(transcode_needed) // transcode column name from ?ClientCharset to $request:charset	if(transcode_needed)
	// transcode column name from ?ClientCharset to $request:charset
services.transcode(str, length,	services.transcode(str, length,
str, length,	str, length,
client_charset,	client_charset,
Line 359 public:	Line 379 public:
if(unsigned long row_count=(unsigned long)PQntuples(res))	if(unsigned long row_count=(unsigned long)PQntuples(res))
for(unsigned long r=0; r<row_count; r++) {	for(unsigned long r=0; r<row_count; r++) {
CHECK(handlers.add_row(sql_error));	CHECK(handlers.add_row(sql_error));
for(int i=0; i<column_count; i++){	for(size_t i=0; i<column_count; i++){
const char *cell=PQgetvalue(res, r, i);	char *cell=PQgetvalue(res, r, i);
size_t length;
	size_t length=0;
const char* str;	const char* str;

switch(column_types[i]){	switch(column_types[i]){
	case BOOLOID:
	case INT8OID:
	case INT2OID:
	case INT4OID:
	case FLOAT4OID:
	case FLOAT8OID:
	case DATEOID:
	case TIMEOID:
	case TIMESTAMPOID:
	case TIMESTAMPTZOID:
	case TIMETZOID:
	case NUMERICOID:
	length=(size_t)PQgetlength(res, r, i);
	str=length ? strdup(services, cell, length) : 0;
	// transcode is never required for these types
	break;
case OIDOID:	case OIDOID:
{	{
char *error_pos=0;
Oid oid=cell?atoi(cell):0;	Oid oid=cell?atoi(cell):0;
int fd=lo_open(conn, oid, INV_READ);	int fd=lo_open(conn, oid, INV_READ);
if(fd>=0){	if(fd>=0){
Line 389 public:	Line 425 public:
PQclear_throw("lo_read can not read all bytes of object");	PQclear_throw("lo_read can not read all bytes of object");
strm[length]=0;	strm[length]=0;
str=strm;	str=strm;
	if(transcode_needed) {
	// transcode cell value from ?ClientCharset to $request:charset
	services.transcode(str, length,
	str, length,
	client_charset,
	request_charset);
	}
} else	} else
str=0;	str=0;
if(lo_close(conn, fd)<0)	if(lo_close(conn, fd)<0)
PQclear_throwPQerror;	PQclear_throwPQerror;
} else	} else
PQclear_throwPQerror;	PQclear_throwPQerror;
	break;
}	}
default:	default:
// normal column, read it normally	// normal column, read it normally
length=(size_t)PQgetlength(res, r, i);	length=(size_t)PQgetlength(res, r, i);
if(length){	str=length ? strdup(services, cell, length) : 0;
char* strm=(char*)services.malloc(length+1);	if(transcode_needed) {
memcpy(strm, cell, length+1);	// transcode cell value from ?ClientCharset to $request:charset
str=strm;	services.transcode(str, length,
} else	str, length,
str=0;	client_charset,
}	request_charset);
	}
if(str && length && transcode_column[i]){	break;
// transcode cell value from ?ClientCharset to $request:charset
services.transcode(str, length,
str, length,
client_charset,
request_charset);
}	}

CHECK(handlers.add_row_cell(sql_error, str, length));	CHECK(handlers.add_row_cell(sql_error, str, length));
}	}
}	}
Line 452 private:	Line 490 private:
connection.client_charset);	connection.client_charset);
}	}
}	}
int name_numner=atoi(ph.name);	int name_number=atoi(ph.name);
if(name_numner <= 0 \|\| (size_t)name_numner > placeholders_count)	if(name_number <= 0 \|\| (size_t)name_number > placeholders_count)
connection.services->_throw("bad bind parameter key");	connection.services->_throw("bad bind parameter key");

paramValues[name_numner-1]=ph.value;	paramValues[name_number-1]=ph.value;
}	}
}	}

Line 489 private:	Line 527 private:
const char *_preprocess_statement(	const char *_preprocess_statement(
Connection& connection,	Connection& connection,
const char *astatement,	const char *astatement,
	size_t statement_size,
unsigned long offset,	unsigned long offset,
unsigned long limit	unsigned long limit
){	){
PGconn *conn=connection.conn;	PGconn *conn=connection.conn;

size_t statement_size=strlen(astatement);	if(!statement_size)
	statement_size=strlen(astatement);

char result=(char )connection.services->malloc(statement_size	char result=(char )connection.services->malloc(statement_size
+MAX_NUMBER*2+15 // limit # offset #	+MAX_NUMBER*2+15 // " limit # offset #"
+MAX_STRING // in case of short 'strings'	+MAX_STRING // in case of short 'strings'
+1);	+1);
// offset & limit -> suffixes	// offset & limit -> suffixes
Line 506 private:	Line 546 private:
char *cur=result;	char *cur=result;
memcpy(cur, astatement, statement_size); cur+=statement_size;	memcpy(cur, astatement, statement_size); cur+=statement_size;
if(limit!=SQL_NO_LIMIT)	if(limit!=SQL_NO_LIMIT)
cur+=snprintf(cur, 7+MAX_NUMBER, " limit %u", limit);	cur+=snprintf(cur, 7+MAX_NUMBER, " limit %lu", limit);
if(offset)	if(offset)
cur+=snprintf(cur, 8+MAX_NUMBER, " offset %u", offset);	cur+=snprintf(cur, 8+MAX_NUMBER, " offset %lu", offset);
o=result;	o=result;
} else	} else
o=astatement;	o=astatement;
Line 518 private:	Line 558 private:
while(*o) {	while(*o) {
if(	if(
o[0]=='/' &&	o[0]=='/' &&
o[1]=='*' &&	o[1]=='*' &&
o[2]=='*') { // name start	o[2]=='*') { // name start
const char* saved_o=o;	const char* saved_o=o;
o+=3;	o+=3;

E-mail:

Removed from v.1.34
changed lines
	Added in v.1.39