From 7f2c20a6b47319f541bf9f944841c2c5a61d664e Mon Sep 17 00:00:00 2001 From: xnuinside Date: Fri, 12 Jan 2024 21:41:13 +0300 Subject: [PATCH 1/2] release 0.15.0 --- CHANGELOG.txt | 5 +++++ README.md | 5 +++++ docs/README.rst | 9 +++++++++ omymodels/from_ddl.py | 1 + pyproject.toml | 6 ++++-- 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6604397..2b8e5b9 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,8 @@ +**v0.14.0** +## Updates +1. Foreign Key processing updates - https://github.com/xnuinside/omymodels/pull/55 +2. Move to simple-ddl-parser version 1.X + **v0.14.0** ## Updates diff --git a/README.md b/README.md index 83fbd79..86e3d6f 100644 --- a/README.md +++ b/README.md @@ -307,6 +307,11 @@ If you see any bugs or have any suggestions - feel free to open the issue. Any h One more time, big 'thank you!' goes to https://github.com/archongum for Web-version: https://archon-omymodels-online.hf.space/ ## Changelog +**v0.14.0** +## Updates +1. Foreign Key processing updates - https://github.com/xnuinside/omymodels/pull/55 +2. Move to simple-ddl-parser version 1.X + **v0.14.0** ## Updates diff --git a/docs/README.rst b/docs/README.rst index 58e0499..0f19afd 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -336,6 +336,15 @@ Updates ------- +#. Foreign Key processing updates - https://github.com/xnuinside/omymodels/pull/55 +#. Move to simple-ddl-parser version 1.X + +**v0.14.0** + +Updates +------- + + #. Python 3.11 support. **v0.13.0** diff --git a/omymodels/from_ddl.py b/omymodels/from_ddl.py index 6273a7f..ac30c40 100644 --- a/omymodels/from_ddl.py +++ b/omymodels/from_ddl.py @@ -47,6 +47,7 @@ def create_models( # extract data from ddl file data = get_tables_information(ddl, ddl_path) data = prepare_data(data) + print(data) data = convert_ddl_to_models(data, no_auto_snake_case) if not data["tables"] and not data["types"]: if exit_silent: diff --git a/pyproject.toml b/pyproject.toml index 5d8400d..452bd1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "omymodels" -version = "0.14.0" +version = "0.15.0" description = "O! My Models (omymodels) is a library to generate Python Models for SQLAlchemy (ORM & Core), GinoORM, Pydantic, Pydal tables & Python Dataclasses from SQL DDL. And convert one models to another." authors = ["Iuliia Volkova "] license = "MIT" @@ -33,11 +33,13 @@ table-meta = "^0.1.5" [tool.poetry.dev-dependencies] pytest = "^7.4" m2r = "^0.3.1" -twine = "^4.0" [tool.poetry.scripts] omm = 'omymodels.cli:main' +[tool.poetry.group.dev.dependencies] +twine = "^4.0.2" + [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" From db00d4e589f6492fc6f17bfadc5d574d9530eb4a Mon Sep 17 00:00:00 2001 From: xnuinside Date: Fri, 12 Jan 2024 21:45:29 +0300 Subject: [PATCH 2/2] fix issues release 0.15.1 --- CHANGELOG.txt | 2 +- README.md | 2 +- docs/README.rst | 2 +- omymodels/from_ddl.py | 1 - pyproject.toml | 2 +- tests/functional/generator/test_sqlalchemy.py | 1 - 6 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 2b8e5b9..3df876c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,4 @@ -**v0.14.0** +**v0.15.1** ## Updates 1. Foreign Key processing updates - https://github.com/xnuinside/omymodels/pull/55 2. Move to simple-ddl-parser version 1.X diff --git a/README.md b/README.md index 86e3d6f..c68c9a4 100644 --- a/README.md +++ b/README.md @@ -307,7 +307,7 @@ If you see any bugs or have any suggestions - feel free to open the issue. Any h One more time, big 'thank you!' goes to https://github.com/archongum for Web-version: https://archon-omymodels-online.hf.space/ ## Changelog -**v0.14.0** +**v0.15.1** ## Updates 1. Foreign Key processing updates - https://github.com/xnuinside/omymodels/pull/55 2. Move to simple-ddl-parser version 1.X diff --git a/docs/README.rst b/docs/README.rst index 0f19afd..eb8d6e4 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -330,7 +330,7 @@ One more time, big 'thank you!' goes to https://github.com/archongum for Web-ver Changelog --------- -**v0.14.0** +**v0.15.1** Updates ------- diff --git a/omymodels/from_ddl.py b/omymodels/from_ddl.py index ac30c40..6273a7f 100644 --- a/omymodels/from_ddl.py +++ b/omymodels/from_ddl.py @@ -47,7 +47,6 @@ def create_models( # extract data from ddl file data = get_tables_information(ddl, ddl_path) data = prepare_data(data) - print(data) data = convert_ddl_to_models(data, no_auto_snake_case) if not data["tables"] and not data["types"]: if exit_silent: diff --git a/pyproject.toml b/pyproject.toml index 452bd1e..41f559f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "omymodels" -version = "0.15.0" +version = "0.15.1" description = "O! My Models (omymodels) is a library to generate Python Models for SQLAlchemy (ORM & Core), GinoORM, Pydantic, Pydal tables & Python Dataclasses from SQL DDL. And convert one models to another." authors = ["Iuliia Volkova "] license = "MIT" diff --git a/tests/functional/generator/test_sqlalchemy.py b/tests/functional/generator/test_sqlalchemy.py index 95dc0c4..118d332 100644 --- a/tests/functional/generator/test_sqlalchemy.py +++ b/tests/functional/generator/test_sqlalchemy.py @@ -356,5 +356,4 @@ class Table2(Base): ("reference_to_table_in_another_schema") REFERENCES "schema2"."table2" ("id"); """ result = create_models(ddl, schema_global=False, models_type="sqlalchemy")["code"] - print(result) assert result == expected