Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pdo/pdo_dbh.c branches/PHP_5_3/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

2010-04-12 Thread Christopher Jones 

Ilia,

This would be worth a NEWS entry.

Chris

Ilia Alshanetsky wrote:

iliaaThu, 01 Apr 2010 12:08:55 +

Revision: http://svn.php.net/viewvc?view=revision&revision=297273

Log:
On beginTransaction() reset error state

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
U   php/php-src/trunk/ext/pdo/pdo_dbh.c

Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c  2010-04-01 11:51:26 UTC 
(rev 297272)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c  2010-04-01 12:08:55 UTC 
(rev 297273)
@@ -597,6 +597,7 @@
 {
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);

+   PDO_DBH_CLEAR_ERR();
PDO_CONSTRUCT_CHECK;

if (dbh->in_txn) {

Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c  2010-04-01 11:51:26 UTC 
(rev 297272)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c  2010-04-01 12:08:55 UTC 
(rev 297273)
@@ -851,6 +851,7 @@
RETURN_FALSE;
}

+   PDO_DBH_CLEAR_ERR();
PDO_CONSTRUCT_CHECK;

if (pdo_dbh_attribute_set(dbh, attr, value TSRMLS_CC) != FAILURE) {

Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
===
--- php/php-src/trunk/ext/pdo/pdo_dbh.c 2010-04-01 11:51:26 UTC (rev 297272)
+++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2010-04-01 12:08:55 UTC (rev 297273)
@@ -851,6 +851,7 @@
RETURN_FALSE;
}

+   PDO_DBH_CLEAR_ERR();
PDO_CONSTRUCT_CHECK;

if (pdo_dbh_attribute_set(dbh, attr, value TSRMLS_CC) != FAILURE) {




--
Email: christopher.jo...@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/
Free PHP Book: http://tinyurl.com/ugpomhome

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pdo/pdo_dbh.c branches/PHP_5_3/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

2010-04-01 Thread Pierre Joye 
hi Ilia,

Thanks :-)

On Thu, Apr 1, 2010 at 2:08 PM, Ilia Alshanetsky  wrote:
> iliaa                                    Thu, 01 Apr 2010 12:08:55 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=297273
>
> Log:
> On beginTransaction() reset error state
>
> Changed paths:
>    U   php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
>    U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
>    U   php/php-src/trunk/ext/pdo/pdo_dbh.c
>
> Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
> ===
> --- php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c      2010-04-01 11:51:26 
> UTC (rev 297272)
> +++ php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c      2010-04-01 12:08:55 
> UTC (rev 297273)
> @@ -597,6 +597,7 @@
>  {
>        pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
>
> +       PDO_DBH_CLEAR_ERR();
>        PDO_CONSTRUCT_CHECK;
>
>        if (dbh->in_txn) {
>
> Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
> ===
> --- php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c      2010-04-01 11:51:26 
> UTC (rev 297272)
> +++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c      2010-04-01 12:08:55 
> UTC (rev 297273)
> @@ -851,6 +851,7 @@
>                RETURN_FALSE;
>        }
>
> +       PDO_DBH_CLEAR_ERR();
>        PDO_CONSTRUCT_CHECK;
>
>        if (pdo_dbh_attribute_set(dbh, attr, value TSRMLS_CC) != FAILURE) {
>
> Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
> ===
> --- php/php-src/trunk/ext/pdo/pdo_dbh.c 2010-04-01 11:51:26 UTC (rev 297272)
> +++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2010-04-01 12:08:55 UTC (rev 297273)
> @@ -851,6 +851,7 @@
>                RETURN_FALSE;
>        }
>
> +       PDO_DBH_CLEAR_ERR();
>        PDO_CONSTRUCT_CHECK;
>
>        if (pdo_dbh_attribute_set(dbh, attr, value TSRMLS_CC) != FAILURE) {
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>



-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pdo/pdo_dbh.c branches/PHP_5_3/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

2010-04-01 Thread Ilia Alshanetsky 
iliaaThu, 01 Apr 2010 12:08:55 +

Revision: http://svn.php.net/viewvc?view=revision&revision=297273

Log:
On beginTransaction() reset error state

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
U   php/php-src/trunk/ext/pdo/pdo_dbh.c

Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c  2010-04-01 11:51:26 UTC 
(rev 297272)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c  2010-04-01 12:08:55 UTC 
(rev 297273)
@@ -597,6 +597,7 @@
 {
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);

+   PDO_DBH_CLEAR_ERR();
PDO_CONSTRUCT_CHECK;

if (dbh->in_txn) {

Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c  2010-04-01 11:51:26 UTC 
(rev 297272)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c  2010-04-01 12:08:55 UTC 
(rev 297273)
@@ -851,6 +851,7 @@
RETURN_FALSE;
}

+   PDO_DBH_CLEAR_ERR();
PDO_CONSTRUCT_CHECK;

if (pdo_dbh_attribute_set(dbh, attr, value TSRMLS_CC) != FAILURE) {

Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
===
--- php/php-src/trunk/ext/pdo/pdo_dbh.c 2010-04-01 11:51:26 UTC (rev 297272)
+++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2010-04-01 12:08:55 UTC (rev 297273)
@@ -851,6 +851,7 @@
RETURN_FALSE;
}

+   PDO_DBH_CLEAR_ERR();
PDO_CONSTRUCT_CHECK;

if (pdo_dbh_attribute_set(dbh, attr, value TSRMLS_CC) != FAILURE) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pdo/pdo_dbh.c branches/PHP_5_3/ext/pdo/pdo_dbh.c trunk/ext/pdo/pdo_dbh.c

2009-11-20 Thread Ilia Alshanetsky 
iliaaFri, 20 Nov 2009 18:54:08 +

Revision: http://svn.php.net/viewvc?view=revision&revision=291096

Log:
Don't ignore the 2nd parameter to PDO's quote() method that identifies the data 
type

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
U   php/php-src/trunk/ext/pdo/pdo_dbh.c

Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c  2009-11-20 17:07:32 UTC 
(rev 291095)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c  2009-11-20 18:54:08 UTC 
(rev 291096)
@@ -1091,8 +1091,7 @@
char *qstr;
int qlen;

-   if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s|l", &str, &str_len,
-   ¶mtype)) {
+   if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", 
&str, &str_len, ¶mtype)) {
RETURN_FALSE;
}


Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c  2009-11-20 17:07:32 UTC 
(rev 291095)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c  2009-11-20 18:54:08 UTC 
(rev 291096)
@@ -1144,8 +1144,7 @@
char *qstr;
int qlen;

-   if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s|l", &str, &str_len,
-   ¶mtype)) {
+   if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", 
&str, &str_len, ¶mtype)) {
RETURN_FALSE;
}


Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
===
--- php/php-src/trunk/ext/pdo/pdo_dbh.c 2009-11-20 17:07:32 UTC (rev 291095)
+++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2009-11-20 18:54:08 UTC (rev 291096)
@@ -1145,8 +1145,7 @@
char *qstr;
int qlen;

-   if (FAILURE == zend_parse_parameters(1 TSRMLS_CC, "s|l", &str, &str_len,
-   ¶mtype)) {
+   if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", 
&str, &str_len, ¶mtype)) {
RETURN_FALSE;
}


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php