subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_2\) \/ext\/pdo pdo.c pdo

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo.c pdo_dbh.c

2009-05-02 Thread Ilia Alshanetsky

iliaa   Sat May  2 15:58:39 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdopdo.c pdo_dbh.c 
  Log:
  
  Fixed build, zend_parse_parameters_none() does not exist in 5.2 branch
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo.c?r1=1.57.2.17.2.12r2=1.57.2.17.2.13diff_format=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57.2.17.2.12 
php-src/ext/pdo/pdo.c:1.57.2.17.2.13
--- php-src/ext/pdo/pdo.c:1.57.2.17.2.12Sat May  2 01:38:36 2009
+++ php-src/ext/pdo/pdo.c   Sat May  2 15:58:39 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo.c,v 1.57.2.17.2.12 2009/05/02 01:38:36 kalle Exp $ */
+/* $Id: pdo.c,v 1.57.2.17.2.13 2009/05/02 15:58:39 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -103,10 +103,10 @@
HashPosition pos;
pdo_driver_t **pdriver;
 
-   if (zend_parse_parameters_none() == FAILURE) {
-   return;
+   if (ZEND_NUM_ARGS()) {
+   WRONG_PARAM_COUNT;
}
-   
+
array_init(return_value);
 
zend_hash_internal_pointer_reset_ex(pdo_driver_hash, pos);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.27r2=1.82.2.31.2.28diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.27 
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.28
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.27Sat May  2 01:38:36 2009
+++ php-src/ext/pdo/pdo_dbh.c   Sat May  2 15:58:39 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.27 2009/05/02 01:38:36 kalle Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.28 2009/05/02 15:58:39 iliaa Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -1134,10 +1134,10 @@
HashPosition pos;
pdo_driver_t **pdriver;
 
-   if (zend_parse_parameters_none() == FAILURE) {
-   return;
+   if (ZEND_NUM_ARGS()) {
+   WRONG_PARAM_COUNT;
}
-   
+
array_init(return_value);
 
zend_hash_internal_pointer_reset_ex(pdo_driver_hash, pos);



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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo.c pdo_dbh.c

2009-05-02 Thread Ilia Alshanetsky

5.2 does not have zend_parse_parameters_none() function, please stick  
to ZEND_NUM_ARGS() in that branch.


Ilia Alshanetsky




On 1-May-09, at 9:38 PM, Kalle Sommer Nielsen wrote:


kalle   Sat May  2 01:38:36 2009 UTC

 Modified files:  (Branch: PHP_5_2)
   /php-src/ext/pdo pdo.c pdo_dbh.c
 Log:
 MFH: Fix proto + use zend_parse_parameters_none()

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo.c?r1=1.57.2.17.2.11r2=1.57.2.17.2.12diff_format=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57.2.17.2.11 php-src/ext/pdo/pdo.c: 
1.57.2.17.2.12

--- php-src/ext/pdo/pdo.c:1.57.2.17.2.11Wed Dec 31 11:17:41 2008
+++ php-src/ext/pdo/pdo.c   Sat May  2 01:38:36 2009
@@ -18,7 +18,7 @@
   
+ 
--+

*/

-/* $Id: pdo.c,v 1.57.2.17.2.11 2008/12/31 11:17:41 sebastian Exp $ */
+/* $Id: pdo.c,v 1.57.2.17.2.12 2009/05/02 01:38:36 kalle Exp $ */

#ifdef HAVE_CONFIG_H
#include config.h
@@ -102,6 +102,10 @@
{
HashPosition pos;
pdo_driver_t **pdriver;
+
+   if (zend_parse_parameters_none() == FAILURE) {
+   return;
+   }

array_init(return_value);

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.26r2=1.82.2.31.2.27diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.26 php-src/ext/pdo/ 
pdo_dbh.c:1.82.2.31.2.27

--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.26Fri Mar 27 16:50:38 2009
+++ php-src/ext/pdo/pdo_dbh.c   Sat May  2 01:38:36 2009
@@ -18,7 +18,7 @@
   
+ 
--+

*/

-/* $Id: pdo_dbh.c,v 1.82.2.31.2.26 2009/03/27 16:50:38 felipe Exp $  
*/

+/* $Id: pdo_dbh.c,v 1.82.2.31.2.27 2009/05/02 01:38:36 kalle Exp $ */

/* The PDO Database Handle Class */

@@ -1127,15 +1127,15 @@
}
/* }}} */

-/* {{{ proto array pdo_drivers()
+/* {{{ proto array PDO::getAvailableDrivers()
   Return array of available PDO drivers */
static PHP_METHOD(PDO, getAvailableDrivers)
{
HashPosition pos;
pdo_driver_t **pdriver;

-   if (ZEND_NUM_ARGS()) {
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters_none() == FAILURE) {
+   return;
}

array_init(return_value);



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




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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo.c pdo_dbh.c

2009-05-02 Thread Kalle Sommer Nielsen

Hi Ilia

2009/5/2 Ilia Alshanetsky i...@prohost.org:
 5.2 does not have zend_parse_parameters_none() function, please stick to
 ZEND_NUM_ARGS() in that branch.

Why don't we merge it? Its a two line #define in zend_API.h:

#define zend_parse_parameters_none() \
 zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, )


But ofcourse either way will do :)


 Ilia Alshanetsky






-- 
Kalle Sommer Nielsen
ka...@php.net

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo.c pdo_dbh.c

2009-05-01 Thread Kalle Sommer Nielsen

kalle   Sat May  2 01:38:36 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdopdo.c pdo_dbh.c 
  Log:
  MFH: Fix proto + use zend_parse_parameters_none()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo.c?r1=1.57.2.17.2.11r2=1.57.2.17.2.12diff_format=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57.2.17.2.11 
php-src/ext/pdo/pdo.c:1.57.2.17.2.12
--- php-src/ext/pdo/pdo.c:1.57.2.17.2.11Wed Dec 31 11:17:41 2008
+++ php-src/ext/pdo/pdo.c   Sat May  2 01:38:36 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo.c,v 1.57.2.17.2.11 2008/12/31 11:17:41 sebastian Exp $ */
+/* $Id: pdo.c,v 1.57.2.17.2.12 2009/05/02 01:38:36 kalle Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -102,6 +102,10 @@
 {
HashPosition pos;
pdo_driver_t **pdriver;
+
+   if (zend_parse_parameters_none() == FAILURE) {
+   return;
+   }

array_init(return_value);
 
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.26r2=1.82.2.31.2.27diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.26 
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.27
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.26Fri Mar 27 16:50:38 2009
+++ php-src/ext/pdo/pdo_dbh.c   Sat May  2 01:38:36 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.26 2009/03/27 16:50:38 felipe Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.27 2009/05/02 01:38:36 kalle Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -1127,15 +1127,15 @@
 }
 /* }}} */
 
-/* {{{ proto array pdo_drivers()
+/* {{{ proto array PDO::getAvailableDrivers()
Return array of available PDO drivers */
 static PHP_METHOD(PDO, getAvailableDrivers)
 {
HashPosition pos;
pdo_driver_t **pdriver;
 
-   if (ZEND_NUM_ARGS()) {
-   WRONG_PARAM_COUNT;
+   if (zend_parse_parameters_none() == FAILURE) {
+   return;
}

array_init(return_value);



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo.c pdo_dbh.c pdo_stmt.c php_pdo.h php_pdo_driver.h php_pdo_int.h

2006-05-11 Thread Marcus Boerger

helly   Thu May 11 22:43:44 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pdopdo.c pdo_dbh.c pdo_stmt.c php_pdo.h 
php_pdo_driver.h php_pdo_int.h 
  Log:
  - MFH
. Fix iterator based access
. Add new attribute ATTR_DEFAULT_FETCH_MODE: $bdh-setAttribute()
. Add new fetch mode: FETCH_PROPS_LATE, this fills object member
  variables after calling the constructor (fixes #36428).
  
  http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo.c?r1=1.57.2.17.2.1r2=1.57.2.17.2.2diff_format=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57.2.17.2.1 php-src/ext/pdo/pdo.c:1.57.2.17.2.2
--- php-src/ext/pdo/pdo.c:1.57.2.17.2.1 Tue May  9 23:54:48 2006
+++ php-src/ext/pdo/pdo.c   Thu May 11 22:43:44 2006
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo.c,v 1.57.2.17.2.1 2006/05/09 23:54:48 helly Exp $ */
+/* $Id: pdo.c,v 1.57.2.17.2.2 2006/05/11 22:43:44 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -53,11 +53,23 @@
 /* for exceptional circumstances */
 zend_class_entry *pdo_exception_ce;
 
-PDO_API zend_class_entry *php_pdo_get_exception(void)
+PDO_API zend_class_entry *php_pdo_get_dbh_ce()
+{
+   return pdo_dbh_ce;
+}
+
+PDO_API zend_class_entry *php_pdo_get_exception()
 {
return pdo_exception_ce;
 }
 
+PDO_API char *php_pdo_str_tolower_dup(const char *src, int len)
+{
+   char *dest = emalloc(len + 1);
+   zend_str_tolower_copy(dest, src, len);
+   return dest;
+}
+
 PDO_API zend_class_entry *php_pdo_get_exception_base(int root TSRMLS_DC)
 {
 #if can_handle_soft_dependency_on_SPL  defined(HAVE_SPL)  
((PHP_MAJOR_VERSION  5) || (PHP_MAJOR_VERSION == 5  PHP_MINOR_VERSION = 1))
@@ -74,7 +86,7 @@
}
}
 #endif
-#if (PHP_MAJOR_VERSION = 5)  (PHP_MINOR_VERSION  2)
+#if (PHP_MAJOR_VERSION == 5)  (PHP_MINOR_VERSION  2)
return zend_exception_get_default();
 #else
return zend_exception_get_default(TSRMLS_C);
@@ -83,7 +95,7 @@
 
 zend_class_entry *pdo_dbh_ce, *pdo_dbstmt_ce, *pdo_row_ce;
 
-/* proto array pdo_drivers()
+/* {{{ proto array pdo_drivers()
  Return array of available PDO drivers */
 PHP_FUNCTION(pdo_drivers)
 {
@@ -133,7 +145,7 @@
PHP_RINIT(pdo),
PHP_RSHUTDOWN(pdo),
PHP_MINFO(pdo),
-   1.0.3,
+   1.0.4dev,
STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -303,7 +315,7 @@
 PHP_MINIT_FUNCTION(pdo)
 {
zend_class_entry ce;
-   
+
spl_ce_RuntimeException = NULL;
 
ZEND_INIT_MODULE_GLOBALS(pdo, php_pdo_init_globals, NULL);
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31r2=1.82.2.31.2.1diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31 
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.1
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31 Wed May  3 21:58:38 2006
+++ php-src/ext/pdo/pdo_dbh.c   Thu May 11 22:43:44 2006
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.82.2.31 2006/05/03 21:58:38 pollita Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.1 2006/05/11 22:43:44 helly Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -36,12 +36,13 @@
 #include zend_object_handlers.h
 #include zend_hash.h
 
-void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char 
*sqlstate, const char *supp TSRMLS_DC)
+static int pdo_dbh_attribute_set(pdo_dbh_t *dbh, long attr, zval *value 
TSRMLS_DC);
+
+void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char 
*sqlstate, const char *supp TSRMLS_DC) /* {{{ */
 {
pdo_error_type *pdo_err = dbh-error_code;
char *message = NULL;
const char *msg;
-   
 
if (dbh-error_mode == PDO_ERRMODE_SILENT) {
 #if 0
@@ -98,8 +99,9 @@
efree(message);
}
 }
+/* }}} */
 
-void pdo_handle_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt TSRMLS_DC)
+void pdo_handle_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
 {
pdo_error_type *pdo_err = dbh-error_code;
const char *msg = Unknown;
@@ -178,8 +180,9 @@
efree(supp);
}
 }
+/* }}} */
 
-static char *dsn_from_uri(char *uri, char *buf, size_t buflen TSRMLS_DC)
+static char *dsn_from_uri(char *uri, char *buf, size_t buflen TSRMLS_DC) /* 
{{{ */
 {
php_stream *stream;
char *dsn = NULL;
@@ -191,6 +194,7 @@
}
return dsn;
 }
+/* }}} */
 
 /* {{{ proto void PDO::__construct(string dsn, string username, string passwd 
[, array options])
*/
@@ -350,6 +354,7 @@
dbh-data_source = (const char*)pestrdup(colon + 1, is_persistent);
dbh-username = username ? pestrdup(username, is_persistent) : NULL;
dbh-password = password ? pestrdup(password, is_persistent) : NULL;
+   dbh-default_fetch_type = PDO_FETCH_BOTH;
 
dbh-auto_commit = pdo_attr_lval(options, PDO_ATTR_AUTOCOMMIT, 1 
TSRMLS_CC);

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo.c pdo_dbh.c

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo.c pdo_dbh.c

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo.c pdo_dbh.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo.c pdo_dbh.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo.c pdo_dbh.c pdo_stmt.c php_pdo.h php_pdo_driver.h php_pdo_int.h

5 matches

Site Navigation

Mail list logo

Footer information