Skip to content

Commit b4aeda2

Browse files
committed
Fix build regression with db2_execute_many on LUW
This function wasn't documented, so I had neglected to make an arginfo entry for it. It caused a build failure on LUW as a result. It appears the arguments for db2_execute_many is the same as db2_execute, so just copy that. Tested to build on LUW.
1 parent 4eebfe1 commit b4aeda2

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

ibm_db2.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_execute, 0, 0, 1)
510510
ZEND_ARG_INFO(0, options)
511511
ZEND_END_ARG_INFO()
512512

513+
#ifndef PASE
513514
/* XXX: db2_execute_many isn't documented */
515+
ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_execute_many, 0, 0, 1)
516+
ZEND_ARG_INFO(0, stmt)
517+
ZEND_ARG_INFO(0, options)
518+
ZEND_END_ARG_INFO()
519+
#endif
514520

515521
ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_stmt_errormsg, 0, 0, 0)
516522
ZEND_ARG_INFO(0, stmt)

package.xml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ Cloudscape, and Apache Derby databases.</description>
3030
<email>tessus@php.net</email>
3131
<active>yes</active>
3232
</helper>
33-
<date>2020-11-30</date>
34-
<time>17:35:59</time>
33+
<date>2020-12-02</date>
34+
<time>05:15:47</time>
3535
<version>
36-
<release>2.1.0</release>
36+
<release>2.1.1</release>
3737
<api>2.0.1</api>
3838
</version>
3939
<stability>
@@ -42,13 +42,8 @@ Cloudscape, and Apache Derby databases.</description>
4242
</stability>
4343
<license>Apache License 2.0</license>
4444
<notes>
45-
* 2020-11-30: 2.1.0
46-
- Compatibility with PHP 8
47-
- Fix compatibility with 64-bit PASE/modern IBM i (sqlcli-dev package, pointer/integer width mismatch, XMLSERVICE location, etc)
48-
- Backport character trim from Zend Server
49-
- Major improvements to test suite (fix broken tests, less hardcoding)
50-
- Handle CCSID 65535 on IBM i
51-
- Fix warnings (returning void from non-void, etc)
45+
* 2020-12-02: 2.1.1
46+
- Fix build regression on LUW with db2_execute_many
5247
</notes>
5348
<contents>
5449
<dir name="/">

php_ibm_db2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
$Id$
2424
*/
2525

26-
#define PHP_IBM_DB2_VERSION "2.1.0"
26+
#define PHP_IBM_DB2_VERSION "2.1.1"
2727

2828
#ifndef PHP_IBM_DB2_H
2929
#define PHP_IBM_DB2_H

0 commit comments

Comments
 (0)