Skip to content

Commit

Permalink
Merge branch 'ibmdb:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Xnot authored Aug 7, 2024
2 parents b790914 + fdb3618 commit dd8898e
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 6 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/ibm_db_sa_publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Build and upload to PyPI

# Build on every workflow_dispatch, branch push, tag push, and pull request change
on:
workflow_dispatch:
pull_request:
push:
branches:
- master
# Sequence of patterns matched against refs/tags
tags:
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install build
- name: Build package
run: |
python -m build
- name: Publish distribution to PyPI
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
uses: pypa/gh-action-pypi-publish@release/v1

permissions:
# IMPORTANT: this permission is mandatory for trusted publishing
id-token: write
contents: write # Added permission for GitHub Actions to push tags
18 changes: 18 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
2024-07-30, Version 0.4.1
=========================

* Fix foreign key reflection when there are tables with the same name in different schemas (#128) (Xnot)

* Resolved issue of round function on zos server (#130) (bchoudhary6415)

* Resolved case-sensitive issue of round function (#131) (bchoudhary6415)

* Update pyodbc.py (#133) (Murchurl)

* Fix get_table_comment return value (#135) (andrasore-kodinfo)

* Fix boolean type not recognized warning (#140) (Xnot)

* Assign OS390Reflector for Db2 for z/OS (#147) (rhgit01)


2023-04-20, Version 0.4.0
=========================

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The IBM_DB_SA adapter provides the Python/SQLAlchemy interface to IBM Data Serve

Version
--------
0.4.0 (2023/04/20)
0.4.1 (2024/07/30)

Prerequisites
--------------
Expand Down
2 changes: 1 addition & 1 deletion ibm_db_sa/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# | Contributors: Jaimy Azle, Mike Bayer |
# +--------------------------------------------------------------------------+

__version__ = '0.4.0'
__version__ = '0.4.1'

from . import ibm_db, pyodbc, base

Expand Down
2 changes: 2 additions & 0 deletions ibm_db_sa/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,8 @@ def initialize(self, connection):
_reflector_cls = ibm_reflection.DB2Reflector
elif "IDS/" in self.dbms_name:
_reflector_cls = ibm_reflection.DB2Reflector
elif self.dbms_name.startswith("DSN"):
_reflector_cls = ibm_reflection.OS390Reflector
self._reflector = _reflector_cls(self)

def get_columns(self, connection, table_name, schema=None, **kw):
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
license='Apache License 2.0',
description='SQLAlchemy support for IBM Data Servers',
author='IBM Application Development Team',
author_email='opendev@us.ibm.com',
author_email='balram.choudhary@ibm.com',
url='http://pypi.python.org/pypi/ibm_db_sa/',
download_url='http://code.google.com/p/ibm-db/downloads/list',
keywords='sqlalchemy database interface IBM Data Servers DB2 Informix IDS',
download_url='https://github.com/ibmdb/python-ibmdbsa',
keywords='sqlalchemy database interface IBM Data Servers Db2',
long_description_content_type='text/markdown',
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
Expand Down

0 comments on commit dd8898e

Please sign in to comment.