jsqlib 0.8a0__tar.gz → 0.10a0__tar.gz

{jsqlib-0.8a0 → jsqlib-0.10a0}/PKG-INFO

@@ -1,13 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: jsqlib
-Version: 0.8a0
+Version: 0.10a0
 Summary: JSON to SQL query generator
-Home-page: https://gitlab.com/ru-r5/jsqlib
 License: MPL-2.0
 Keywords: sql,json
 Author: pymancer
 Author-email: pymancer@gmail.com
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.9,<3.13
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Information Technology
@@ -21,10 +20,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Database
 Classifier: Topic :: Software Development :: Libraries
-Requires-Dist: jsonschema (>=4.0,<5.0)
-Requires-Dist: python-box (>=5.4,<6.0)
-Requires-Dist: sqlfluff (>=0.6,<0.7)
+Requires-Dist: jsonschema (>=4,<5)
+Requires-Dist: python-box (>=5,<8)
+Requires-Dist: sqlfluff (>=3,<4)
 Project-URL: Documentation, https://gitlab.com/ru-r5/jsqlib/-/wikis/home
+Project-URL: Homepage, https://gitlab.com/ru-r5/jsqlib
 Project-URL: Repository, https://gitlab.com/ru-r5/jsqlib
 Description-Content-Type: text/markdown
 
@@ -86,7 +86,7 @@ $ poetry run black jsqlib -S
 - lint
 
 ```sh
-$ poetry run flakehell lint
+$ poetry run ruff check
 ```
 
 - type checking
@@ -96,6 +96,12 @@ $ poetry run pyre
 ```
 
 ## Release History
+- 0.10a0
+  - ADD: postgresql pattern matching support (#39)
+- 0.9a0
+  - CHANGE: python-box library updated to version 7 (#28)
+  - CHANGE: sqlfluff library updated to version 3. Warning: query.prettify output may change. (#34)
+  - CHANGE: python 3.12 support (#35)
 - 0.8a0
   - CHANGE: nested `select` in `insert from select` statement (#31)
 - 0.7a0

{jsqlib-0.8a0 → jsqlib-0.10a0}/README.md

@@ -56,7 +56,7 @@ $ poetry run black jsqlib -S
 - lint
 
 ```sh
-$ poetry run flakehell lint
+$ poetry run ruff check
 ```
 
 - type checking
@@ -66,6 +66,12 @@ $ poetry run pyre
 ```
 
 ## Release History
+- 0.10a0
+  - ADD: postgresql pattern matching support (#39)
+- 0.9a0
+  - CHANGE: python-box library updated to version 7 (#28)
+  - CHANGE: sqlfluff library updated to version 3. Warning: query.prettify output may change. (#34)
+  - CHANGE: python 3.12 support (#35)
 - 0.8a0
   - CHANGE: nested `select` in `insert from select` statement (#31)
 - 0.7a0

{jsqlib-0.8a0 → jsqlib-0.10a0}/jsqlib/__init__.py

@@ -6,6 +6,5 @@ Created on Jul 29, 2021
 
 @author: pymancer@gmail.com (polyanalitika.ru)
 """
-from jsqlib.engine import Query
 
-__version__ = '0.8a0'
+from jsqlib.engine import Query as Query

{jsqlib-0.8a0 → jsqlib-0.10a0}/jsqlib/core.py

@@ -6,6 +6,7 @@ Created on Aug 10, 2021
 
 @author: pymancer@gmail.com (polyanalitika.ru)
 """
+
 from __future__ import annotations
 
 from abc import ABCMeta
@@ -308,6 +309,9 @@ class Builder(metaclass=ABCMeta):
     def _gte(self, value: List[SCBND_T]) -> str:
         return self._commute_(value, op='>=')
 
+    def _pattern(self, value: List[SCBND_T]) -> str:
+        return self._commute_(value, op='~')
+
     def _is(self, value: List[SCBND_T], negate: bool = False) -> str:
         condition = 'is not' if negate else 'is'
         return f'{self._eval_(value[0])} {condition} {self._eval_(value[-1])}'

{jsqlib-0.8a0 → jsqlib-0.10a0}/jsqlib/engine.py

@@ -6,6 +6,7 @@ Created on Jul 29, 2021
 
 @author: pymancer@gmail.com (polyanalitika.ru)
 """
+
 import json
 import sqlfluff
 
@@ -88,10 +89,14 @@ class Query:
         if not isinstance(schema, dict):
             schema = True
 
-        return validator_for(schema)(schema)
+        return validator_for(schema)(schema)  # pyre-ignore[20]
 
     def prettify(
-        self, sql: Optional[str] = None, dialect: Optional[str] = None, rules: Optional[List[str]] = None
+        self,
+        sql: Optional[str] = None,
+        dialect: Optional[str] = None,
+        rules: Optional[List[str]] = None,
+        exclude_rules: Optional[List[str]] = None,
     ) -> str:
 
         sql = sql or self.sql
@@ -105,7 +110,7 @@ class Query:
         except KeyError:
             dialect = 'ansi'
 
-        return sqlfluff.fix(sql, dialect=dialect, rules=rules) if sql else sql
+        return sqlfluff.fix(sql, dialect=dialect, rules=rules, exclude_rules=exclude_rules) if sql else sql
 
     def _build(self, *args, **kwargs) -> str:
         built = ''

{jsqlib-0.8a0 → jsqlib-0.10a0}/jsqlib/helpers/common.py

@@ -6,6 +6,7 @@ Created on Aug 10, 2021
 
 @author: pymancer@gmail.com (polyanalitika.ru)
 """
+
 from __future__ import annotations
 
 from re import sub as resub
@@ -234,7 +235,7 @@ class Tokenizer:
         false = self.translator.cast.false
         null = self.translator.cast.null
 
-        if type_ == bool:
+        if type_ is bool:
             result = true if value else false
         elif type_ == NoneType:
             result = null

{jsqlib-0.8a0 → jsqlib-0.10a0}/jsqlib/helpers/constants.py

@@ -6,6 +6,7 @@ Created on Aug 10, 2021
 
 @author: pymancer@gmail.com (polyanalitika.ru)
 """
+
 from box import Box
 
 POSTGRESQL_DIALECT = 'postgresql'

{jsqlib-0.8a0 → jsqlib-0.10a0}/jsqlib/helpers/types.py

@@ -6,6 +6,7 @@ Created on Aug 14, 2021
 
 @author: pymancer@gmail.com (polyanalitika.ru)
 """
+
 from typing import Union
 from typing_extensions import TypeAlias
 

jsqlib-0.10a0/pyproject.toml

@@ -0,0 +1,76 @@
+[tool.poetry]
+name = "jsqlib"
+version = "0.10a0"
+license = "MPL-2.0"
+description = "JSON to SQL query generator"
+authors = ["pymancer <pymancer@gmail.com>"]
+readme = "README.md"
+homepage = "https://gitlab.com/ru-r5/jsqlib"
+repository = "https://gitlab.com/ru-r5/jsqlib"
+documentation = "https://gitlab.com/ru-r5/jsqlib/-/wikis/home"
+keywords = ["sql", "json"]
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Environment :: Console",
+    "Intended Audience :: Information Technology",
+    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
+    "Operating System :: OS Independent",
+    "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 :: Libraries"
+]
+
+[tool.poetry.dependencies]
+python = ">=3.9,<3.13"
+python-box = ">=5,<8"
+sqlfluff = "^3"
+jsonschema = "^4"
+
+[tool.poetry.group.dev.dependencies]
+black = "^24.0"
+icecream = "^2.0"
+pytest = "^8"
+coverage = {extras = ["toml"], version = "^7"}
+pytest-cov = "^5"
+pre-commit = "^3"
+ruff = "^0"
+pyre-check = "^0.9"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.pytest.ini_options]
+minversion = "8.0"
+addopts = "-q"
+testpaths = ["tests"]
+
+[tool.coverage.run]
+source = ["jsqlib"]
+
+[tool.coverage.report]
+fail_under = 90
+
+[tool.black]
+line-length = 120
+target-version = ['py312']
+include = "jsqlib"
+
+[tool.ruff]
+line-length = 120
+indent-width = 4
+target-version = "py312"
+exclude = [
+    'README.md',
+    'tests',
+    '.venv'
+]
+
+[tool.ruff.lint]
+ignore = ['E501']
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["E402"]

jsqlib-0.8a0/pyproject.toml

@@ -1,97 +0,0 @@
-[tool.poetry]
-name = "jsqlib"
-version = "0"
-license = "MPL-2.0"
-description = "JSON to SQL query generator"
-authors = ["pymancer <pymancer@gmail.com>"]
-readme = "README.md"
-homepage = "https://gitlab.com/ru-r5/jsqlib"
-repository = "https://gitlab.com/ru-r5/jsqlib"
-documentation = "https://gitlab.com/ru-r5/jsqlib/-/wikis/home"
-keywords = ["sql", "json"]
-classifiers = [
-    "Development Status :: 3 - Alpha",
-    "Environment :: Console",
-    "Intended Audience :: Information Technology",
-    "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
-    "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3.9",
-    "Topic :: Database",
-    "Topic :: Software Development :: Libraries"
-]
-
-[tool.poetry.dependencies]
-python = "^3.9"
-python-box = "^5.4"
-sqlfluff = "^0.6"
-jsonschema = "^4.0"
-
-[tool.poetry.group.dev.dependencies]
-black = "^22.3.0"
-icecream = "^2.1.2"
-
-[tool.poetry.dev-dependencies]
-pytest = "^6"
-coverage = {extras = ["toml"], version = "^5"}
-pytest-cov = "^2"
-pre-commit = "^2"
-pylint = "^2"
-flake8 = "^3"
-flakehell = "^0.9"
-pyre-check = "^0.9"
-
-[build-system]
-requires = ["setuptools", "poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry-version-plugin]
-source = "init"
-
-[tool.pytest.ini_options]
-minversion = "6.0"
-addopts = "-q"
-testpaths = ["tests"]
-
-[tool.coverage.run]
-source = ["jsqlib"]
-
-[tool.coverage.report]
-fail_under = 90
-
-[tool.black]
-line-length = 120
-target-version = ['py39']
-include = "jsqlib"
-
-[tool.flakehell]
-exclude = ["README.md", "tests/", ".venv/"]
-format = "colored"
-max_line_length = 120
-show_source = true
-extended_default_ignore=[]
-
-[tool.flakehell.plugins]
-flake8-bandit = ["+*", "-S322"]
-flake8-bugbear = ["+*"]
-flake8-builtins = ["+*"]
-flake8-comprehensions = ["+*"]
-flake8-darglint = ["+*"]
-flake8-docstrings = ["+*"]
-flake8-eradicate = ["+*"]
-flake8-isort = ["+*"]
-flake8-mutable = ["+*"]
-flake8-pytest-style = ["+*"]
-flake8-spellcheck = ["+*"]
-pep8-naming = ["+*"]
-pycodestyle = ["+*", "-E203", "-E501", "-W503"]
-pyflakes = ["+*"]
-pylint = ["+*"]
-
-[tool.flakehell.exceptions."tests/"]
-flake8-bandit = ["-*"]
-pyflakes = ["-*"]
-flake8-darglint = ["-*"]
-flake8-docstrings = ["-*"]
-
-[tool.flakehell.exceptions."jsqlib/__init__.py"]
-pyflakes = ["-F401"]