--- sql/pgsql/parser3pgsql.C 2019/11/30 22:11:11 1.46 +++ sql/pgsql/parser3pgsql.C 2021/11/03 16:27:15 1.49 @@ -15,7 +15,7 @@ #include #include -volatile const char * IDENT_PARSER3PGSQL_C="$Id: parser3pgsql.C,v 1.46 2019/11/30 22:11:11 moko Exp $" IDENT_PA_SQL_DRIVER_H; +volatile const char * IDENT_PARSER3PGSQL_C="$Id: parser3pgsql.C,v 1.49 2021/11/03 16:27:15 moko Exp $" IDENT_PA_SQL_DRIVER_H; // from catalog/pg_type.h #define BOOLOID 16 @@ -78,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){ @@ -99,7 +99,6 @@ struct Connection { PGconn *conn; const char* client_charset; bool autocommit; - bool with_default_transactions; bool standard_conforming_strings; }; @@ -117,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 @@ -136,13 +134,8 @@ public: datestyle=value& // 'SET DATESTYLE=value' available values are: ISO|SQL|Postgres|European|US|German [default=ISO] 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 - with_default_transaction=0 // 1 -- wrap connection into BEGIN TRAN/COMMIT/ROLLBACK */ - 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, '/'); @@ -159,20 +152,9 @@ public: *connection_ref=&connection; connection.services=&services; connection.client_charset=0; - connection.autocommit=false; - connection.with_default_transactions=false; + connection.autocommit=true; connection.standard_conforming_strings=true; - 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; - while(options){ if(char *key=lsplit(&options, '&')){ if(*key){ @@ -185,17 +167,8 @@ public: } else if(strcasecmp(key, "datestyle")==0){ datestyle=value; } else if(strcasecmp(key, "autocommit")==0){ - if(atoi(value)==1){ - if(!connection.with_default_transactions) - services._throw("autocommit can be used only with_default_transaction enabled"); - connection.autocommit=true; - } - } else if(strcmp(key, "with_default_transaction")==0){ - if(atoi(value)==1) - connection.with_default_transactions=true; - } else if(strcmp(key, "WithoutDefaultTransaction")==0){ if(atoi(value)==0) - connection.with_default_transactions=true; + connection.autocommit=false; } else if(strcasecmp(key, "standard_conforming_strings")==0){ if(atoi(value)==0) connection.standard_conforming_strings=false; @@ -207,6 +180,14 @@ public: } } + 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+1]="SET CLIENT_ENCODING="; strncat(statement, charset, MAX_STRING); @@ -221,7 +202,8 @@ public: _execute_cmd(connection, statement); } - _transaction_begin(connection); + if(!connection.autocommit) + _execute_cmd(connection, "set AUTOCOMMIT off"); } void disconnect(void *aconnection){ @@ -232,14 +214,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) { @@ -249,8 +231,7 @@ 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; @@ -303,12 +284,7 @@ public: 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; @@ -328,10 +304,7 @@ public: if(transcode_needed){ // transcode query from $request:charset to ?ClientCharset statement_size=strlen(astatement); - services.transcode(astatement, statement_size, - astatement, statement_size, - request_charset, - client_charset); + services.transcode(astatement, statement_size, astatement, statement_size, request_charset, client_charset); } const char *statement=_preprocess_statement(connection, astatement, statement_size, offset, limit); @@ -350,16 +323,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; @@ -389,10 +360,7 @@ public: if(transcode_needed) // transcode column name from ?ClientCharset to $request:charset - services.transcode(str, length, - str, length, - client_charset, - request_charset); + services.transcode(str, length, str, length, client_charset, request_charset); CHECK(handlers.add_column(sql_error, str, length)); } @@ -483,34 +451,19 @@ 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_number=atoi(ph.name); @@ -521,24 +474,6 @@ private: } } - - 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.with_default_transactions) // without ?with_default_transaction=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)) @@ -547,13 +482,7 @@ private: throwPQerror; } - const char *_preprocess_statement( - Connection& connection, - const char *astatement, - size_t statement_size, - 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; if(!statement_size) @@ -586,11 +515,7 @@ private: 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); @@ -748,11 +673,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; }