--- sql/pgsql/parser3pgsql.C 2010/10/27 22:48:51 1.35 +++ sql/pgsql/parser3pgsql.C 2021/11/08 08:57:16 1.51 @@ -1,13 +1,12 @@ /** @file Parser PgSQL driver. - Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2019 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) 2007.10.25 using PgSQL 8.1.5 */ -static const char *RCSId="$Id: parser3pgsql.C,v 1.35 2010/10/27 22:48:51 moko Exp $"; #include "config_includes.h" @@ -16,6 +15,8 @@ static const char *RCSId="$Id: parser3pg #include #include +volatile const char * IDENT_PARSER3PGSQL_C="$Id: parser3pgsql.C,v 1.51 2021/11/08 08:57:16 moko Exp $" IDENT_PA_SQL_DRIVER_H; + // from catalog/pg_type.h #define BOOLOID 16 #define INT8OID 20 @@ -77,7 +78,7 @@ static char* rsplit(char* string, char d return v+1; } } - return NULL; + return NULL; } static void toupper_str(char *out, const char *in, size_t size){ @@ -85,13 +86,20 @@ static void toupper_str(char *out, const *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 { SQL_Driver_services* services; PGconn *conn; const char* client_charset; bool autocommit; - bool without_default_transactions; + bool standard_conforming_strings; }; /** @@ -108,15 +116,14 @@ public: /// initialize driver by loading sql dynamic link library const char *initialize(char *dlopen_file_spec){ - return dlopen_file_spec? - dlink(dlopen_file_spec):"client library column is empty"; + return dlopen_file_spec ? dlink(dlopen_file_spec) : "client library column is empty"; } #define throwPQerror connection.services->_throw(PQerrorMessage(connection.conn)) #define PQclear_throw(msg) { \ PQclear(res); \ connection.services->_throw(msg); \ - } + } #define PQclear_throwPQerror PQclear_throw(PQerrorMessage(connection.conn)) /** connect @@ -125,88 +132,94 @@ public: ClientCharset=charset& // transcode by parser charset=value& // transcode by server with 'SET CLIENT_ENCODING=value' datestyle=value& // 'SET DATESTYLE=value' available values are: ISO|SQL|Postgres|European|US|German [default=ISO] - autocommit=1& // each transaction is commited automatically (default) - WithoutDefaultTransaction=0 // 1 -- disable any BEGIN TRAN/COMMIT/ROLLBACK [can NOT be used with autocommit option] + autocommit=0& // 1 -- each statement is commited automatically, only when with_default_transaction enabled + standard_conforming_strings=1& // 0 -- escape \ char that could be needed for old servers */ - void connect( - char* url, - SQL_Driver_services& services, - void** connection_ref ///< output: Connection* - ){ + void connect(char* url, SQL_Driver_services& services, void** connection_ref /* < output: Connection* */){ char* user=url; char* host=rsplit(user, '@'); char* db=lsplit(host, '/'); char* pwd=lsplit(user, ':'); - char* port=lsplit(host, ':'); char *options=lsplit(db, '?'); char* charset=0; char* datestyle=0; + char* pq_options=0; + size_t pq_options_len=options ? strlen(options) : 0; + Connection& connection=*(Connection *)services.malloc(sizeof(Connection)); + *connection_ref=&connection; connection.services=&services; - connection.client_charset=0; + connection.client_charset=0; connection.autocommit=true; - connection.without_default_transactions=false; - - connection.conn=PQsetdbLogin( - (host&&strcasecmp(host, "local")==0)?NULL/* local Unix domain socket */:host, port, - NULL, NULL, db, user, pwd); - - if(!connection.conn) - services._throw("PQsetdbLogin failed"); - - if(PQstatus(connection.conn)!=CONNECTION_OK) - throwPQerror; + connection.standard_conforming_strings=true; while(options){ if(char *key=lsplit(&options, '&')){ if(*key){ if(char *value=lsplit(key, '=')){ - if(strcmp(key, "ClientCharset")==0){ + if(strcmp(key, "ClientCharset")==0){ // transcoding with parser toupper_str(value, value, strlen(value)); connection.client_charset=value; - } else if(strcasecmp(key, "charset")==0){ + } else if(strcasecmp(key, "charset")==0){ // transcoding with server charset=value; } else if(strcasecmp(key, "datestyle")==0){ datestyle=value; } else if(strcasecmp(key, "autocommit")==0){ - if(connection.without_default_transactions) - services._throw("options WithoutDefaultTransaction and autocommit can't be used together"); if(atoi(value)==0) connection.autocommit=false; - } else if(strcmp(key, "WithoutDefaultTransaction")==0){ - if(!connection.autocommit) - services._throw("options WithoutDefaultTransaction and autocommit can't be used together"); - if(atoi(value)==1){ - connection.without_default_transactions=true; - connection.autocommit=false; + } else if(strcasecmp(key, "standard_conforming_strings")==0){ + if(atoi(value)==0) + connection.standard_conforming_strings=false; + } else { + if(!pq_options) { + pq_options=(char*)services.malloc_atomic(pq_options_len+2); + strcpy(pq_options, "?"); + } else { + strcat(pq_options, "&"); } - } else - services._throw("unknown connect option" /*key*/); + strcat(pq_options, key); + strcat(pq_options, "="); + strcat(pq_options, value); + } } else services._throw("connect option without =value" /*key*/); } } } - if(charset){ - char statement[MAX_STRING]="SET CLIENT_ENCODING="; - strncat(statement, charset, MAX_STRING); + if(host && (strchr(host, ',') || pq_options)){ // pq_options can exist only if host and db are not null + char pq_url[MAX_STRING]; + snprintf(pq_url, MAX_STRING, "postgresql://%s/%s%s", host, db ? db : "", pq_options ? pq_options : ""); + connection.conn=PQsetdbLogin(NULL, NULL, NULL, NULL, pq_url, user, pwd); + } else { + char* port=lsplit(host, ':'); + connection.conn=PQsetdbLogin( (host && strcasecmp(host, "local") == 0) ? NULL /* local Unix domain socket */ : host, port, NULL, NULL, db, user, pwd); + } + + if(!connection.conn) + services._throw("PQsetdbLogin failed"); + + if(PQstatus(connection.conn)!=CONNECTION_OK) + throwPQerror; + if(charset){ + char statement[MAX_STRING]; + snprintf(statement, MAX_STRING, "SET CLIENT_ENCODING=%s", charset); _execute_cmd(connection, statement); } if(datestyle){ - char statement[MAX_STRING]="SET DATESTYLE="; - strncat(statement, datestyle, MAX_STRING); - + char statement[MAX_STRING]; + snprintf(statement, MAX_STRING, "SET DATESTYLE=%s", datestyle); _execute_cmd(connection, statement); } - _transaction_begin(connection); + if(!connection.autocommit) + _execute_cmd(connection, "BEGIN"); } void disconnect(void *aconnection){ @@ -217,14 +230,14 @@ public: void commit(void *aconnection){ Connection& connection=*static_cast(aconnection); - _transaction_commit(connection); - _transaction_begin(connection); + if(!connection.autocommit) + _execute_cmd(connection, "COMMIT"); } void rollback(void *aconnection){ Connection& connection=*static_cast(aconnection); - _transaction_rollback(connection); - _transaction_begin(connection); + if(!connection.autocommit) + _execute_cmd(connection, "ROLLBACK"); } bool ping(void *aconnection) { @@ -234,50 +247,60 @@ public: // 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* quote(void *aconnection, const char *str, unsigned int length){ + Connection& connection=*static_cast(aconnection); + const char* from; const char* from_end=str+length; size_t quoted=0; - for(from=str; from(aconnection); char *result=(char*)connection.services->malloc_atomic(length + quoted + 1); char *to = result; - for(from=str; from "''" - *to++='\''; - break; - case '\\': // "\" -> "\\" - *to++='\\'; - break; + if(connection.standard_conforming_strings){ + for(from=str; from "''" + *to++=*from; + } + } else { + for(from=str; from "''" + *to++= '\''; + break; + case '\\': // "\" -> "\\" + *to++='\\'; + break; + } + *to++=*from; } - *to++=*from; } *to=0; return result; } - void query(void *aconnection, - const char *astatement, - size_t placeholders_count, Placeholder* placeholders, - unsigned long offset, unsigned long limit, - SQL_Driver_query_event_handlers& handlers - ){ + void query(void *aconnection, const char *astatement, size_t placeholders_count, Placeholder* placeholders, unsigned long offset, unsigned long limit, SQL_Driver_query_event_handlers& handlers ){ Connection& connection=*static_cast(aconnection); SQL_Driver_services& services=*connection.services; PGconn *conn=connection.conn; @@ -293,16 +316,14 @@ public: _bind_parameters(placeholders_count, placeholders, paramValues, connection, transcode_needed); } + size_t statement_size=0; if(transcode_needed){ // transcode query from $request:charset to ?ClientCharset - size_t length=strlen(astatement); - services.transcode(astatement, length, - astatement, length, - request_charset, - client_charset); + statement_size=strlen(astatement); + services.transcode(astatement, statement_size, astatement, statement_size, request_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? PGresult *res; @@ -318,16 +339,14 @@ public: SQL_Error sql_error; switch(PQresultStatus(res)) { - case PGRES_EMPTY_QUERY: + case PGRES_EMPTY_QUERY: PQclear_throw("no query"); break; case PGRES_COMMAND_OK: // empty result: insert|delete|update|... PQclear(res); - if(connection.autocommit) - commit(aconnection); return; case PGRES_TUPLES_OK: - break; + break; default: PQclear_throwPQerror; break; @@ -339,7 +358,7 @@ public: goto cleanup; \ } - int column_count=PQnfields(res); + size_t column_count=PQnfields(res); if(!column_count) PQclear_throw("result contains no columns"); @@ -347,40 +366,17 @@ public: column_count=MAX_COLS; unsigned int column_types[MAX_COLS]; - bool transcode_column[MAX_COLS]; - for(int i=0; i=0){ @@ -420,32 +432,34 @@ public: PQclear_throw("lo_read can not read all bytes of object"); strm[length]=0; str=strm; + if(transcode_needed) { + // transcode cell value from ?ClientCharset to $request:charset + services.transcode(str, length, + str, length, + client_charset, + request_charset); + } } else str=0; if(lo_close(conn, fd)<0) PQclear_throwPQerror; } else PQclear_throwPQerror; + break; } default: // normal column, read it normally length=(size_t)PQgetlength(res, r, i); - if(length){ - char* strm=(char*)services.malloc(length+1); - memcpy(strm, cell, length+1); - str=strm; - } else - str=0; - } - - if(str && length && transcode_column[i]){ - // transcode cell value from ?ClientCharset to $request:charset - services.transcode(str, length, - str, length, - client_charset, - request_charset); + str=length ? strdup(services, cell, length) : 0; + if(transcode_needed) { + // transcode cell value from ?ClientCharset to $request:charset + services.transcode(str, length, + str, length, + client_charset, + request_charset); + } + break; } - CHECK(handlers.add_row_cell(sql_error, str, length)); } } @@ -453,62 +467,29 @@ cleanup: PQclear(res); if(failed) services._throw(sql_error); - - if(connection.autocommit) - commit(aconnection); } private: - void _bind_parameters( - size_t placeholders_count, - Placeholder* placeholders, - const char** paramValues, - Connection& connection, - bool transcode_needed - ){ + void _bind_parameters( size_t placeholders_count, Placeholder* placeholders, const char** paramValues, Connection& connection, bool transcode_needed){ for(size_t i=0; itranscode(ph.name, strlen(ph.name), - ph.name, name_length, - connection.services->request_charset(), - connection.client_charset); + connection.services->transcode(ph.name, strlen(ph.name), ph.name, name_length, connection.services->request_charset(), connection.client_charset); if(ph.value) { size_t value_length; - connection.services->transcode(ph.value, strlen(ph.value), - ph.value, value_length, - connection.services->request_charset(), - connection.client_charset); + connection.services->transcode(ph.value, strlen(ph.value), ph.value, value_length, connection.services->request_charset(), connection.client_charset); } } - int name_numner=atoi(ph.name); - if(name_numner <= 0 || (size_t)name_numner > placeholders_count) + int name_number=atoi(ph.name); + if(name_number <= 0 || (size_t)name_number > placeholders_count) connection.services->_throw("bad bind parameter key"); - paramValues[name_numner-1]=ph.value; + paramValues[name_number-1]=ph.value; } } - - void _transaction_begin(Connection& connection){ - _execute_transactions_cmd(connection, "BEGIN"); - } - - void _transaction_commit(Connection& connection){ - _execute_transactions_cmd(connection, "COMMIT"); - } - - void _transaction_rollback(Connection& connection){ - _execute_transactions_cmd(connection, "ROLLBACK"); - } - - void _execute_transactions_cmd(const Connection& connection, const char *query){ - if(!connection.without_default_transactions) // with option ?WithoutDefaultTransaction=1 user must execute BEGIN/COMMIT/ROLLBACK by himself - _execute_cmd(connection, query); - } - // executes a query and throw away the result. void _execute_cmd(const Connection& connection, const char *query){ if(PGresult *res=PQexec(connection.conn, query)) @@ -517,18 +498,14 @@ private: throwPQerror; } - const char *_preprocess_statement( - Connection& connection, - const char *astatement, - unsigned long offset, - unsigned long limit - ){ + const char *_preprocess_statement(Connection& connection, const char *astatement, size_t statement_size, unsigned long offset, unsigned long limit){ 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 - +MAX_NUMBER*2+15 // limit # offset # + +MAX_NUMBER*2+15 // " limit # offset #" +MAX_STRING // in case of short 'strings' +1); // offset & limit -> suffixes @@ -537,9 +514,9 @@ private: char *cur=result; memcpy(cur, astatement, statement_size); cur+=statement_size; 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) - cur+=snprintf(cur, 8+MAX_NUMBER, " offset %u", offset); + cur+=snprintf(cur, 8+MAX_NUMBER, " offset %lu", offset); o=result; } else o=astatement; @@ -549,16 +526,12 @@ private: while(*o) { if( o[0]=='/' && - o[1]=='*' && + o[1]=='*' && o[2]=='*') { // name start const char* saved_o=o; o+=3; while(*o) - if( - o[0]=='*' && - o[1]=='*' && - o[2]=='/' && - o[3]=='\'') { // name end + if(o[0]=='*' && o[1]=='*' && o[2]=='/' && o[3]=='\'') { // name end saved_o=0; // found, marking that o+=4; Oid oid=lo_creat(conn, INV_READ|INV_WRITE); @@ -679,12 +652,25 @@ private: // conn client library funcs private: // conn 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) + const char *dlink(char *dlopen_file_spec) { + if(lt_dlinit()){ + if(const char* result=lt_dlerror()) + return result; + return "can not prepare to dynamic loading"; + } + + lt_dlhandle handle; + do { + char *next=lsplit(dlopen_file_spec, ','); + handle=lt_dlopen(dlopen_file_spec); + dlopen_file_spec=next; + } while (!handle && dlopen_file_spec); + + if(!handle){ + if(const char* result=lt_dlerror()) + return result; return "can not open the dynamic link module"; + } #define DSLINK(name, action) \ name=(t_##name)lt_dlsym(handle, #name); \ @@ -692,7 +678,7 @@ private: // conn client library funcs li action; #define DLINK(name) DSLINK(name, return "function " #name " was not found") - + DLINK(PQsetdbLogin); DLINK(PQerrorMessage); DLINK(PQstatus); @@ -708,11 +694,11 @@ private: // conn client library funcs li DLINK(PQexecParams); DLINK(PQftype); DLINK(PQescapeStringConn); - DLINK(lo_open); DLINK(lo_close); - DLINK(lo_read); DLINK(lo_write); - DLINK(lo_lseek); DLINK(lo_creat); - DLINK(lo_tell); DLINK(lo_unlink); - DLINK(lo_import); DLINK(lo_export); + DLINK(lo_open); DLINK(lo_close); + DLINK(lo_read); DLINK(lo_write); + DLINK(lo_lseek); DLINK(lo_creat); + DLINK(lo_tell); DLINK(lo_unlink); + DLINK(lo_import); DLINK(lo_export); return 0; }