Merge pull request #7 from stout-yeoman/sqlalchemy2

Sqlalchemy2
pjwerneck · Dec 8, 2023 · e304d7b · e304d7b
2 parents 503e227 + 8d179e1
commit e304d7b
Show file tree

Hide file tree

Showing 10 changed files with 661 additions and 548 deletions.
diff --git a/.gitignore b/.gitignore
@@ -104,3 +104,6 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+# VS Code
+.vscode
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,10 +14,12 @@ keywords = ['sqlachemy', 'sql', 'rql', 'querying', 'httpapi']
 [tool.poetry.dependencies]
 python = "^3.8"
 pyrql = "^0.6.0"
-sqlalchemy = "<2.0"
+sqlalchemy = "^2.0"
 
-[tool.poetry.dev-dependencies]
-pytest = ">=4.4.1"
+[tool.poetry.group.dev.dependencies]
+isort = "^5.12.0"
+black = "^23.11.0"
+pytest = "^7.4.3"
 
 [build-system]
 requires = ["poetry>=0.12"]

diff --git a/rqlalchemy/__init__.py b/rqlalchemy/__init__.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
 
-from rqlalchemy.query import RQLQueryError
-from rqlalchemy.query import RQLQueryMixIn
+from rqlalchemy.query import RQLSelect
+from rqlalchemy.query import RQLSelectError
 
 __title__ = "rqlalchemy"
 __version__ = "0.4.5"
 __author__ = "Pedro Werneck"
 __license__ = "MIT"
 
 
-__all__ = ["RQLQueryMixIn", "RQLQueryError"]
+__all__ = ["RQLSelect", "RQLSelectError"]