Skip to content

Add Python 3.15 wheel support and resolve SPARRAY tests on zLinux/s390x #1074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Earammak wants to merge 2 commits into
base: master
Choose a base branch
from
+67 −36
Open

Add Python 3.15 wheel support and resolve SPARRAY tests on zLinux/s390x #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
315da00
Add Python 3.15 wheel support and resolve SPARRAY tests on zLinux/s390x
Earammak Sep 10, 2026
303024a
Add Python 3.15 wheel support and resolve SPARRAY tests on zLinux/s390x
Earammak Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions .github/workflows/bld_wheels_and_upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ jobs:
steps:
- uses: actions/checkout@v5
- name: Build wheels
uses: pypa/cibuildwheel@v3.4.1
uses: pypa/cibuildwheel@v4.2.0
env:
CIBW_BUILD: "*-win_amd64"
CIBW_SKIP: "cp38-* *t-*"
CIBW_SKIP: "*t-*"
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "python -c \"import shutil,sys; shutil.copy2(sys.argv[1], sys.argv[2])\" {wheel} {dest_dir}"

- name: Inject ibm_db_dll.pth into wheels
run: python scripts/inject_pth_into_wheel.py wheelhouse
Expand All @@ -44,10 +45,11 @@ jobs:
steps:
- uses: actions/checkout@v5
- name: Build wheels
uses: pypa/cibuildwheel@v3.4.1
uses: pypa/cibuildwheel@v4.2.0
env:
CIBW_BUILD: "*-win32"
CIBW_SKIP: "cp38-* *t-*"
CIBW_SKIP: "*t-*"
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "python -c \"import shutil,sys; shutil.copy2(sys.argv[1], sys.argv[2])\" {wheel} {dest_dir}"

- name: Inject ibm_db_dll.pth into wheels
run: python scripts/inject_pth_into_wheel.py wheelhouse
Expand All @@ -67,15 +69,15 @@ jobs:
steps:
- uses: actions/checkout@v5
- name: Build wheels
uses: pypa/cibuildwheel@v3.4.1
uses: pypa/cibuildwheel@v4.2.0
env:
CIBW_ARCHS_LINUX: "x86_64 i686"
# clidriver v12.1 needs glibc >= 2.34 and CPUs supporting the x86_64-v2
# instruction set (see https://github.com/pypa/manylinux/issues/1725),
# so manylinux2014 (glibc 2.17) can no longer be used here.
CIBW_MANYLINUX_I686_IMAGE: manylinux_2_34
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_34
CIBW_SKIP: "cp38-* *t-* *-musllinux_* *-*linux_{aarch64,ppc64le}"
CIBW_SKIP: "*t-* *-musllinux_* *-*linux_{aarch64,ppc64le}"
CIBW_REPAIR_WHEEL_COMMAND_LINUX:
auditwheel repair
--disable-isa-ext-check
Expand Down Expand Up @@ -106,9 +108,9 @@ jobs:
steps:
- uses: actions/checkout@v5
- name: Build wheels
uses: pypa/cibuildwheel@v3.4.1
uses: pypa/cibuildwheel@v4.2.0
env:
CIBW_SKIP: "cp38-* *t-*"
CIBW_SKIP: "*t-*"
MACOSX_DEPLOYMENT_TARGET: 14.0

- uses: actions/upload-artifact@v6
Expand All @@ -126,10 +128,10 @@ jobs:
steps:
- uses: actions/checkout@v5
- name: Build wheels
uses: pypa/cibuildwheel@v3.4.1
uses: pypa/cibuildwheel@v4.2.0
env:
CIBW_ARCHS: "x86_64"
CIBW_SKIP: "cp38-* *t-*"
CIBW_SKIP: "*t-*"
MACOSX_DEPLOYMENT_TARGET: 10.15

- uses: actions/upload-artifact@v6
Expand All @@ -156,7 +158,6 @@ jobs:
rm -rf "$TARBALL"
tar -czf "$TARBALL" "$DIRNAME"
rm -rf "$DIRNAME"

- name: Upload sdist
uses: actions/upload-artifact@v6
with:
Expand Down
79 changes: 54 additions & 25 deletions ibm_db.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ typedef struct _param_cache_node
SQLINTEGER *ivalueArray; /* Temp storage array of values */
double *fvalueArray; /* Temp storage array of values */
SQLINTEGER *bind_indicator_array; /* Temp storage array of values */
SQLSMALLINT cardinality;
SQLSMALLINT actual_cardinality;
SQLINTEGER cardinality;
SQLINTEGER actual_cardinality;
struct _param_cache_node *next; /* Pointer to next node */
} param_node;

Expand Down Expand Up @@ -510,7 +510,7 @@ char *strtoupper(char *data, int max)
#ifndef __MVS__
static void _python_ibm_db_set_array_param_cardinality(stmt_handle *stmt_res,
param_node *curr,
SQLSMALLINT cardinality)
SQLINTEGER cardinality)
{

SQLHDESC hIPD = (SQLHDESC)0;
Expand Down Expand Up @@ -546,25 +546,43 @@ static void _python_ibm_db_set_array_param_cardinality(stmt_handle *stmt_res,

if (curr->param_type == SQL_PARAM_INPUT && hIPD != NULL) {
rc = SQLSetDescField(hIPD, curr->param_num, SQL_DESC_CARDINALITY,
(SQLPOINTER)(intptr_t)cardinality, SQL_IS_SMALLINT);
(SQLPOINTER)(intptr_t)cardinality, SQL_IS_INTEGER);
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
LogMsg(ERROR, "Failed to set SQL_DESC_CARDINALITY on hIPD(INPUT)");
} else {
LogMsg(DEBUG, "Set SQL_DESC_CARDINALITY on hIPD(INPUT)");
}

rc = SQLSetDescField(hAPD, curr->param_num, SQL_DESC_CARDINALITY_PTR,
rc = SQLSetDescField(hIPD, curr->param_num, SQL_DESC_CARDINALITY_PTR,
(SQLPOINTER)&curr->actual_cardinality, SQL_IS_POINTER);
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
LogMsg(ERROR, "Failed to set SQL_DESC_CARDINALITY_PTR on hAPD(INPUT)");
LogMsg(ERROR, "Failed to set SQL_DESC_CARDINALITY_PTR on hIPD(INPUT)");
} else {
LogMsg(DEBUG, "Set SQL_DESC_CARDINALITY_PTR on hAPD(INPUT)");
LogMsg(DEBUG, "Set SQL_DESC_CARDINALITY_PTR on hIPD(INPUT)");
}

if (hAPD != NULL) {
rc = SQLSetDescField(hAPD, curr->param_num, SQL_DESC_CARDINALITY,
(SQLPOINTER)(intptr_t)cardinality, SQL_IS_INTEGER);
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
LogMsg(ERROR, "Failed to set SQL_DESC_CARDINALITY on hAPD(INPUT)");
} else {
LogMsg(DEBUG, "Set SQL_DESC_CARDINALITY on hAPD(INPUT)");
}

rc = SQLSetDescField(hAPD, curr->param_num, SQL_DESC_CARDINALITY_PTR,
(SQLPOINTER)&curr->actual_cardinality, SQL_IS_POINTER);
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
LogMsg(ERROR, "Failed to set SQL_DESC_CARDINALITY_PTR on hAPD(INPUT)");
} else {
LogMsg(DEBUG, "Set SQL_DESC_CARDINALITY_PTR on hAPD(INPUT)");
}
}
}

else if (curr->param_type == SQL_PARAM_OUTPUT && hAPD != NULL) {
rc = SQLSetDescField(hAPD, curr->param_num, SQL_DESC_CARDINALITY,
(SQLPOINTER)(intptr_t)cardinality, SQL_IS_SMALLINT);
(SQLPOINTER)(intptr_t)cardinality, SQL_IS_INTEGER);
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
LogMsg(ERROR, "Failed to set SQL_DESC_CARDINALITY on hAPD(OUTPUT)");
} else {
Expand All @@ -583,7 +601,7 @@ static void _python_ibm_db_set_array_param_cardinality(stmt_handle *stmt_res,
else if (curr->param_type == SQL_PARAM_INPUT_OUTPUT) {
if (hIPD != NULL) {
rc = SQLSetDescField(hIPD, curr->param_num, SQL_DESC_CARDINALITY,
(SQLPOINTER)(intptr_t)cardinality, SQL_IS_SMALLINT);
(SQLPOINTER)(intptr_t)cardinality, SQL_IS_INTEGER);
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
LogMsg(ERROR, "Failed to set SQL_DESC_CARDINALITY on hIPD(INOUT)");
} else {
Expand All @@ -601,7 +619,7 @@ static void _python_ibm_db_set_array_param_cardinality(stmt_handle *stmt_res,

if (hAPD != NULL) {
rc = SQLSetDescField(hAPD, curr->param_num, SQL_DESC_CARDINALITY,
(SQLPOINTER)(intptr_t)cardinality, SQL_IS_SMALLINT);
(SQLPOINTER)(intptr_t)cardinality, SQL_IS_INTEGER);
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
LogMsg(ERROR, "Failed to set SQL_DESC_CARDINALITY on hAPD(INOUT)");
} else {
Expand Down Expand Up @@ -9238,7 +9256,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
"Before set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -9323,7 +9341,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
"Before set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -9402,7 +9420,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -9484,7 +9502,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -9563,7 +9581,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -9923,7 +9941,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -10503,7 +10521,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -10804,7 +10822,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -10921,7 +10939,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -10997,7 +11015,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -11081,7 +11099,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -11212,7 +11230,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -11332,7 +11350,7 @@ static int _python_ibm_db_bind_data(stmt_handle *stmt_res, param_node *curr, PyO
" cardinality=%d, actual_cardinality=%d, n(array size)=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality, (int)n);
LogMsg(DEBUG, messageStr);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLSMALLINT)n);
_python_ibm_db_set_array_param_cardinality(stmt_res, curr, (SQLINTEGER)n);
snprintf(messageStr, sizeof(messageStr),
"After set_array_param_cardinality: param_num=%d, param_type=%d, cardinality=%d, actual_cardinality=%d",
curr->param_num, curr->param_type, curr->cardinality, curr->actual_cardinality);
Expand Down Expand Up @@ -19958,7 +19976,9 @@ static PyObject* ibm_db_fetch_callproc(PyObject* self, PyObject* args)

int idx = 1;
while (curr && idx <= numOfParam) {
curr->cardinality = curr->actual_cardinality;
if (curr->actual_cardinality > 0 && curr->actual_cardinality > curr->cardinality) {
curr->cardinality = curr->actual_cardinality;
}
snprintf(messageStr, sizeof(messageStr), "Processing parameter %d (param_type=%d, data_type=%d, cardinality=%d, bind_indicator=%d)",
curr->param_num, curr->param_type, curr->data_type, curr->cardinality, curr->bind_indicator);
LogMsg(DEBUG, messageStr);
Expand Down Expand Up @@ -19992,8 +20012,17 @@ static PyObject* ibm_db_fetch_callproc(PyObject* self, PyObject* args)

if (!skip_param) {

if (curr->cardinality > 1 && curr->actual_cardinality > 0) {
if (curr->cardinality > 1 || (curr->var_pyvalue && PyList_Check(curr->var_pyvalue))) {
int len = curr->actual_cardinality;
if (curr->var_pyvalue && PyList_Check(curr->var_pyvalue)) {
Py_ssize_t py_len = PyList_Size(curr->var_pyvalue);
if (py_len > len) {
len = (int)py_len;
}
}
if (len <= 0) {
len = curr->cardinality;
}
PyObject *pyList = PyList_New(len);
if (!pyList) {
Py_DECREF(pyVal);
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ def run(self):
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Programming Language :: Python :: 3.14',
'Programming Language :: Python :: 3.15',
'Topic :: Database :: Front-Ends'],

long_description = open(readme).read(),
Expand Down