@@ -278,10 +278,6 @@ static bool pgsql_handle_preparer(pdo_dbh_t *dbh, zend_string *sql, pdo_stmt_t *
278
278
execute_only = H -> disable_prepares ;
279
279
}
280
280
281
- if (!emulate && PQprotocolVersion (H -> server ) <= 2 ) {
282
- emulate = 1 ;
283
- }
284
-
285
281
if (emulate ) {
286
282
stmt -> supports_placeholders = PDO_PLACEHOLDER_NONE ;
287
283
} else {
@@ -445,19 +441,7 @@ static int pdo_pgsql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
445
441
}
446
442
447
443
case PDO_ATTR_SERVER_VERSION :
448
- if (PQprotocolVersion (H -> server ) >= 3 ) { /* PostgreSQL 7.4 or later */
449
- ZVAL_STRING (return_value , (char * )PQparameterStatus (H -> server , "server_version" ));
450
- } else /* emulate above via a query */
451
- {
452
- PGresult * res = PQexec (H -> server , "SELECT VERSION()" );
453
- if (res && PQresultStatus (res ) == PGRES_TUPLES_OK ) {
454
- ZVAL_STRING (return_value , (char * )PQgetvalue (res , 0 , 0 ));
455
- }
456
-
457
- if (res ) {
458
- PQclear (res );
459
- }
460
- }
444
+ ZVAL_STRING (return_value , (char * )PQparameterStatus (H -> server , "server_version" ));
461
445
break ;
462
446
463
447
case PDO_ATTR_CONNECTION_STATUS :
@@ -675,8 +659,8 @@ PHP_METHOD(PDO_PGSql_Ext, pgsqlCopyFromArray)
675
659
buffer_len = Z_STRLEN_P (tmp );
676
660
query = erealloc (query , buffer_len + 2 ); /* room for \n\0 */
677
661
}
678
- memcpy (query , Z_STRVAL_P (tmp ), Z_STRLEN_P (tmp ));
679
662
query_len = Z_STRLEN_P (tmp );
663
+ memcpy (query , Z_STRVAL_P (tmp ), query_len );
680
664
if (query [query_len - 1 ] != '\n' ) {
681
665
query [query_len ++ ] = '\n' ;
682
666
}
0 commit comments