Skip to content

Commit

Permalink
Merge branch 'master' into sa-2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xzkostyan authored Oct 29, 2023
2 parents 52e04da + e16d482 commit 9a14437
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12"
clickhouse-version:
- 23.8.4.69
- 22.5.1.2079
- 19.3.5
- 18.14.9
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sa-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
strategy:
matrix:
python-version:
- "3.11"
- "3.12"
clickhouse-version:
- 23.8.4.69
sa-version: [18, 19, 20, 21, 22]
Expand Down
18 changes: 17 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
# Changelog

## [Unreleased]
## [0.2.5] - 2023-10-29
### Added
- Table primary key reflection. Pull request [#265](https://github.com/xzkostyan/clickhouse-sqlalchemy/pull/265) by [akurdyukov](https://github.com/akurdyukov). Solves issue [#264](https://github.com/xzkostyan/clickhouse-sqlalchemy/issues/264).
- Python 3.11, 3.12 in Travis CI build matrix.

### Fixed
- Missing Array attributes. Pull request [#255](https://github.com/xzkostyan/clickhouse-sqlalchemy/pull/255) by [jonburdo](https://github.com/jonburdo). Solves issue [#254](https://github.com/xzkostyan/clickhouse-sqlalchemy/issues/254).
- DateTime and DateTime64 reflection. Solves issue [#148](https://github.com/xzkostyan/clickhouse-sqlalchemy/issues/148).
- Enum8 and Enum16 Unicode conversion. Pull request [#263](https://github.com/xzkostyan/clickhouse-sqlalchemy/pull/263) by [akurdyukov](https://github.com/akurdyukov). Solves issue [#192](https://github.com/xzkostyan/clickhouse-sqlalchemy/issues/192).
- [HTTP] Map type escaping. Pull request [#266](https://github.com/xzkostyan/clickhouse-sqlalchemy/pull/266) by [subkanthi](https://github.com/subkanthi). Solves issue [#148](https://github.com/xzkostyan/clickhouse-sqlalchemy/issues/148).
- Guess number of `_reflect_table` alembic argsPull request [#249](https://github.com/xzkostyan/clickhouse-sqlalchemy/pull/249) by [9bany](https://github.com/9bany). Solves issue [#250](https://github.com/xzkostyan/clickhouse-sqlalchemy/issues/250).

### Removed
- greenlet dependency. Pull request [#257](https://github.com/xzkostyan/clickhouse-sqlalchemy/pull/257) by [mrcljx](https://github.com/mrcljx).

## [0.2.4] - 2023-05-02
### Added
- [Native] DateTime('timezone'). Solves issue [#230](https://github.com/xzkostyan/clickhouse-sqlalchemy/issues/230).
Expand Down Expand Up @@ -310,7 +325,8 @@ Log, TinyLog, Null.
- Chunked `INSERT INTO` in one request.
- Engines: MergeTree, CollapsingMergeTree, SummingMergeTree, Buffer, Memory.

[Unreleased]: https://github.com/xzkostyan/clickhouse-sqlalchemy/compare/0.2.4...HEAD
[Unreleased]: https://github.com/xzkostyan/clickhouse-sqlalchemy/compare/0.2.5...HEAD
[0.2.5]: https://github.com/xzkostyan/clickhouse-sqlalchemy/compare/0.2.4...0.2.5
[0.2.4]: https://github.com/xzkostyan/clickhouse-sqlalchemy/compare/0.2.3...0.2.4
[0.2.3]: https://github.com/xzkostyan/clickhouse-sqlalchemy/compare/0.2.2...0.2.3
[0.2.2]: https://github.com/xzkostyan/clickhouse-sqlalchemy/compare/0.2.1...0.2.2
Expand Down
2 changes: 1 addition & 1 deletion clickhouse_sqlalchemy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from .sql import Table, MaterializedView, select


VERSION = (0, 2, 4)
VERSION = (0, 2, 5)
__version__ = '.'.join(str(x) for x in VERSION)


Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ def read_version():
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',

'Topic :: Database',
'Topic :: Software Development',
Expand Down
5 changes: 3 additions & 2 deletions tests/types/test_numeric.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ def test_insert_overflow(self):
# 'out of range' is raised from `struct` within
# `clickhouse_driver`,
# before the query is sent to CH.
ex_text = str(ex.exception)
self.assertTrue(
'out of range' in str(ex.exception) or
'Too many digits' in str(ex.exception)
'out of range' in ex_text or 'format requires' in ex_text or
'Too many digits' in ex_text
)


Expand Down

0 comments on commit 9a14437

Please sign in to comment.