Merge branch 'feature/cursor-async' of https://github.com/DaveRandom/pecl-database-pq
authorMichael Wallner <mike@php.net>
Fri, 29 May 2015 07:44:10 +0000 (09:44 +0200)
committerMichael Wallner <mike@php.net>
Fri, 29 May 2015 07:44:10 +0000 (09:44 +0200)
1  2 
src/php_pqconn.c
src/php_pqcur.c

Simple merge
diff --cc src/php_pqcur.c
@@@ -237,9 -318,23 +318,23 @@@ static PHP_METHOD(pqcur, __construct) 
  ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_open, 0, 0, 0)
  ZEND_END_ARG_INFO();
  static PHP_METHOD(pqcur, open)
+ {
+       cur_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+ }
+ ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_openAsync, 0, 0, 0)
+ ZEND_END_ARG_INFO();
+ static PHP_METHOD(pqcur, openAsync)
+ {
+       cur_open(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+ }
+ ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_close, 0, 0, 0)
+ ZEND_END_ARG_INFO();
+ static PHP_METHOD(pqcur, close)
  {
        zend_error_handling zeh;
 -      STATUS rv;
 +      ZEND_RESULT_CODE rv;
  
        zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();
        }
  }
  
- ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_close, 0, 0, 0)
+ ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_closeAsync, 0, 0, 0)
  ZEND_END_ARG_INFO();
- static PHP_METHOD(pqcur, close)
+ static PHP_METHOD(pqcur, closeAsync)
  {
        zend_error_handling zeh;
 -      STATUS rv;
 +      ZEND_RESULT_CODE rv;
  
        zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
        rv = zend_parse_parameters_none();