Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:33136 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 38528 invoked by uid 1010); 14 Nov 2007 15:20:52 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 38511 invoked from network); 14 Nov 2007 15:20:52 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 14 Nov 2007 15:20:52 -0000 Authentication-Results: pb1.pair.com smtp.mail=helly@php.net; spf=unknown; sender-id=unknown Authentication-Results: pb1.pair.com header.from=helly@php.net; sender-id=unknown Received-SPF: unknown (pb1.pair.com: domain php.net does not designate 85.214.94.56 as permitted sender) X-PHP-List-Original-Sender: helly@php.net X-Host-Fingerprint: 85.214.94.56 aixcept.net Linux 2.6 Received: from [85.214.94.56] ([85.214.94.56:32820] helo=h1149922.serverkompetenz.net) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 30/77-55670-0521B374 for ; Wed, 14 Nov 2007 10:20:51 -0500 Received: from dhcp-172-28-204-176.zrh.corp.google.com (unknown [193.142.125.1]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by h1149922.serverkompetenz.net (Postfix) with ESMTP id EE8B51B3656; Wed, 14 Nov 2007 16:20:41 +0100 (CET) Date: Wed, 14 Nov 2007 16:20:41 +0100 Reply-To: Marcus Boerger X-Priority: 3 (Normal) Message-ID: <1135495835.20071114162041@marcus-boerger.de> To: Hans-Peter Oeri CC: internals@lists.php.net In-Reply-To: <34.58.09095.DDFD8374@pb1.pair.com> References: <34.58.09095.DDFD8374@pb1.pair.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] pdo_firebird: "RETURNING" queries/closeCursor (#43246/43271) From: helly@php.net (Marcus Boerger) Hello Hans-Peter, please avoid '#if 0' instead follow the CODING_STYLE and use your cvs account name, '#if ACCOUNT_0' but oh wait you have none. Both these patches as well as thew table stuff patch look fine. Care to get a cvs account for pdo_firebird? marcus Tuesday, November 13, 2007, 12:20:57 AM, you wrote: > diff -u php5-orig/ext/pdo_firebird/firebird_statement.c > php5/ext/pdo_firebird/firebird_statement.c > --- php5-orig/ext/pdo_firebird/firebird_statement.c 2007-11-12 16:59:34.000000000 +0100 > +++ php5/ext/pdo_firebird/firebird_statement.c 2007-11-12 16:58:46.000000000 +0100 > @@ -99,11 +99,15 @@ > /* assume all params have been bound */ > +#if 0 > if ((S->statement_type == isc_info_sql_stmt_exec_procedure && > isc_dsql_execute2(H->isc_status, &H->tr, &S->stmt, > PDO_FB_SQLDA_VERSION, > S->in_sqlda, &S->out_sqlda)) > || isc_dsql_execute(H->isc_status, &H->tr, &S->stmt, > PDO_FB_SQLDA_VERSION, > S->in_sqlda)) { > +#else > + if (isc_dsql_execute(H->isc_status, &H->tr, &S->stmt, PDO_FB_SQLDA_VERSION, S->>in_sqlda)) { > +#endif > break; > } > @@ -138,9 +142,11 @@ > /* an EXECUTE PROCEDURE statement can be fetched from once, without calling > the API, because > * the result was returned in the execute call */ > +#if 0 > if (S->statement_type == isc_info_sql_stmt_exec_procedure) { > S->exhausted = 1; > } else { > +#endif > if (isc_dsql_fetch(H->isc_status, &S->stmt, PDO_FB_SQLDA_VERSION, > &S->out_sqlda)) { > if (H->isc_status[0] && H->isc_status[1]) { > RECORD_ERROR(stmt); > @@ -148,7 +154,9 @@ > S->exhausted = 1; > return 0; > } > +#if 0 > } > +#endif > return 1; > } > return 0; Best regards, Marcus