pyrsql 0.0.4__tar.gz → 0.0.5__tar.gz

{pyrsql-0.0.4 → pyrsql-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrsql
-Version: 0.0.4
+Version: 0.0.5
 Summary: Compiler-oriented RSQL query engine for safe, typed, and extensible Python ORM-backed APIs.
 Keywords: rsql,orm,filter,pagination,sort,sqlalchemy,fastapi,rest
 License-Expression: MIT
@@ -9,7 +9,6 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -20,11 +19,11 @@ Classifier: Topic :: Database
 Classifier: Topic :: Software Development :: Compilers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Dist: msgspec>=0.18,<1.0
-Requires-Dist: typing-extensions>=4.10.0 ; python_full_version < '3.11'
-Requires-Dist: fastapi>=0.110,<1.0 ; extra == 'fastapi'
-Requires-Dist: sqlalchemy>=2.0,<3.0 ; extra == 'sqlalchemy'
-Requires-Python: >=3.10
+Requires-Dist: msgspec>=0.22.0,<1.0
+Requires-Dist: fastapi>=0.150.0,<1.0 ; extra == 'fastapi'
+Requires-Dist: sqlalchemy[asyncio]>=2.1,<3.0 ; extra == 'sqlalchemy'
+Requires-Dist: typing-extensions>=4.10.0 ; extra == 'sqlalchemy'
+Requires-Python: >=3.11
 Project-URL: Homepage, https://github.com/wskr00/pyrsql
 Project-URL: Repository, https://github.com/wskr00/pyrsql
 Project-URL: Issues, https://github.com/wskr00/pyrsql/issues
@@ -38,7 +37,7 @@ Description-Content-Type: text/markdown
 A compiler-oriented RSQL query engine for safe, typed, and extensible
 filtering, sorting, and pagination in Python APIs.
 
-[![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14%20%7C%203.14t-blue?logo=python)](https://pypi.org/project/pyrsql/)
+[![Python](https://img.shields.io/badge/python-3.11%20%7C%203.12%20%7C%203.13%20%7C%203.14%20%7C%203.14t-blue?logo=python)](https://pypi.org/project/pyrsql/)
 [![License](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 
 pyrsql compiles RSQL query strings into ORM-specific statement objects
@@ -51,9 +50,9 @@ For FastAPI applications using SQLAlchemy, the recommended entry point is
 declarative resources; the lower-level query, adapter, and ORM APIs remain
 available when more control is needed.
 
-**Current backends:** SQLAlchemy 2.0  
-**Current framework adapters:** FastAPI  
-**Planned:** Django ORM, SQLModel, Flask
+- **Current backends:** SQLAlchemy 2.1+
+- **Current framework adapters:** FastAPI
+- **Planned:** Django ORM, SQLModel, Flask
 
 ## Why pyrsql?
 
@@ -276,6 +275,10 @@ Full documentation at **[wskr00.github.io/pyrsql](https://wskr00.github.io/pyrsq
 - Strong typing
 - ORM-neutral public API
 
+## Acknowledgements
+
+`pyrsql` was strongly inspired by [Jirutka's `rsql-parser`](https://github.com/jirutka/rsql-parser) and [PerplexHub's `rsql-jpa-specification`](https://github.com/perplexhub/rsql-jpa-specification), especially their RSQL syntax and filtering behavior. I am grateful to their maintainers and contributors for their work.
+
 ## License
 
 [MIT](LICENSE).

{pyrsql-0.0.4 → pyrsql-0.0.5}/README.md

@@ -3,7 +3,7 @@
 A compiler-oriented RSQL query engine for safe, typed, and extensible
 filtering, sorting, and pagination in Python APIs.
 
-[![Python](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14%20%7C%203.14t-blue?logo=python)](https://pypi.org/project/pyrsql/)
+[![Python](https://img.shields.io/badge/python-3.11%20%7C%203.12%20%7C%203.13%20%7C%203.14%20%7C%203.14t-blue?logo=python)](https://pypi.org/project/pyrsql/)
 [![License](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 
 pyrsql compiles RSQL query strings into ORM-specific statement objects
@@ -16,9 +16,9 @@ For FastAPI applications using SQLAlchemy, the recommended entry point is
 declarative resources; the lower-level query, adapter, and ORM APIs remain
 available when more control is needed.
 
-**Current backends:** SQLAlchemy 2.0  
-**Current framework adapters:** FastAPI  
-**Planned:** Django ORM, SQLModel, Flask
+- **Current backends:** SQLAlchemy 2.1+
+- **Current framework adapters:** FastAPI
+- **Planned:** Django ORM, SQLModel, Flask
 
 ## Why pyrsql?
 
@@ -241,6 +241,10 @@ Full documentation at **[wskr00.github.io/pyrsql](https://wskr00.github.io/pyrsq
 - Strong typing
 - ORM-neutral public API
 
+## Acknowledgements
+
+`pyrsql` was strongly inspired by [Jirutka's `rsql-parser`](https://github.com/jirutka/rsql-parser) and [PerplexHub's `rsql-jpa-specification`](https://github.com/perplexhub/rsql-jpa-specification), especially their RSQL syntax and filtering behavior. I am grateful to their maintainers and contributors for their work.
+
 ## License
 
 [MIT](LICENSE).

{pyrsql-0.0.4 → pyrsql-0.0.5}/docs/explanation/architecture.md

@@ -28,7 +28,7 @@ The project is designed around four major responsibilities:
 - backend lowering: turn validated query objects into ORM-specific statements
 - optional framework adapters and integrations: expose the core in HTTP stacks
 
-The current production backend is SQLAlchemy 2.0. The current framework
+The current production backend is SQLAlchemy 2.1+. The current framework
 adapter is FastAPI.
 
 ## Current Pipeline

{pyrsql-0.0.4 → pyrsql-0.0.5}/docs/index.md

@@ -45,7 +45,7 @@ I/O.
 ## Key features
 
 - **ORM-neutral core** - `Query`, `Sort`, `PageRequest` have zero ORM dependencies
-- **Pluggable backends** - SQLAlchemy 2.0 today, Django ORM / SQLModel planned
+- **Pluggable backends** - SQLAlchemy 2.1+ today, Django ORM / SQLModel planned
 - **Pluggable adapters** - FastAPI today, Flask planned
 - **20+ built-in operators** - `==`, `=like=`, `=in=`, `=bt=`, `=nn=`, etc.
 - **Custom operators** - define your own RSQL operators with per-ORM lowering

{pyrsql-0.0.4 → pyrsql-0.0.5}/docs/quickstart.md

@@ -55,7 +55,7 @@ from pyrsql import Query
 Query.parse("name==demo")            # equal
 Query.parse("age=gt=18")             # greater than
 Query.parse("id=in=(1,2,3)")         # IN
-Query.parse("name=like=demo*")       # LIKE
+Query.parse("name=like=demo")        # contains: LIKE '%demo%'
 Query.parse("score=bt=(10,20)")      # BETWEEN
 Query.parse("name==demo;age=gt=18")  # AND
 Query.parse("name==demo,age=gt=18")  # OR

pyrsql-0.0.5/docs/reference/operators.md

@@ -0,0 +1,51 @@
+# Operators
+
+Pyrsql supports the base RSQL comparison operators and the extensions used by
+PerplexHub's JPA specification.
+
+## Comparison operators
+
+| Operator | Aliases | Arity | Description |
+|----------|---------|-------|-------------|
+| `==` | | 1 | Equal |
+| `!=` | | 1 | Not equal |
+| `=gt=` | `>` | 1 | Greater than |
+| `=ge=` | `>=` | 1 | Greater or equal |
+| `=lt=` | `<` | 1 | Less than |
+| `=le=` | `<=` | 1 | Less or equal |
+| `=in=` | | 1..100 | IN (comma-separated args) |
+| `=out=` | | 1..100 | NOT IN |
+| `=like=` | `=ke=` | 1 | Contains match (`LIKE '%value%'`) |
+| `=notlike=` | `=nk=` | 1 | Negated contains match |
+| `=ilike=` | `=ik=` | 1 | Case-insensitive contains match |
+| `=inotlike=` | `=ni=` | 1 | Negated case-insensitive contains match |
+| `=ic=` | `=icase=` | 1 | Case-insensitive equality |
+| `=bt=` | `=between=` | 2 | BETWEEN (exactly 2 args) |
+| `=nb=` | `=notbetween=` | 2 | NOT BETWEEN (exactly 2 args) |
+| `=na=` | `=isnull=`, `=null=` | 0..1 | IS NULL |
+| `=nn=` | `=notnull=`, `=isnotnull=` | 0..1 | IS NOT NULL |
+
+For `=like=`, `=notlike=`, `=ilike=`, and `=inotlike=`, pyrsql surrounds the
+argument with `%` to match anywhere in the value. These operators use SQL
+`LIKE` pattern rules: `%` matches any number of characters, `_` matches one,
+and `*` is literal. The `like_escape_character` option controls SQL pattern
+escaping.
+
+For string-column `==` and `!=`, `*` is the wildcard and any `^` marker
+requests case-insensitive matching. Quoting an argument does not disable these
+markers. Use `=in=(*)` to match a literal asterisk.
+
+## Logical operators
+
+| Operator | Aliases | Description |
+|----------|---------|-------------|
+| `;` | `and` | AND (higher precedence) |
+| `,` | `or` | OR (lower precedence) |
+
+## Sort modifiers
+
+| Modifier | Example | Description |
+|----------|---------|-------------|
+| `asc` | `name,asc` | Ascending (default) |
+| `desc` | `name,desc` | Descending |
+| `ic` | `name,desc,ic` | Ignore case |

{pyrsql-0.0.4 → pyrsql-0.0.5}/docs/reference/options.md

@@ -26,6 +26,10 @@
 
 Notes:
 
+- `strict_equality=True` makes string `==` and `!=` compare markers such as
+  `*` and `^` literally; quoting alone does not disable them
+- `like_escape_character` applies to LIKE-based operators, including equality
+  comparisons that contain `*`
 - configuration containers are normalized into immutable views
 - procedure allow/block rules are compiled as regex policies and evaluated with
   `fullmatch`, not partial match

{pyrsql-0.0.4 → pyrsql-0.0.5}/docs/usage/query.md

@@ -29,10 +29,10 @@ Query.parse("name=nn=")            # IS NOT NULL
 ## Text matching
 
 ```python
-Query.parse("name=like=demo*")     # LIKE
+Query.parse("name=like=demo")      # contains: LIKE '%demo%'
 Query.parse("name=notlike=demo")   # NOT LIKE
-Query.parse("name=ic=demo*")       # ILIKE (case-insensitive)
-Query.parse("name=ilike=DEMO")     # ILIKE alias
+Query.parse("name=ic=DEMO")        # case-insensitive equality
+Query.parse("name=ilike=DEMO")     # case-insensitive contains
 ```
 
 ## Range
@@ -54,15 +54,19 @@ Query.parse("(name==demo;age=gt=18),status==active")  # grouping
 
 ```python
 Query.parse("name=='de\\'mo'")     # quoted string with escape
-Query.parse("name=='*not a wildcard*'")  # literal asterisks inside quotes
+Query.parse('name=="Kill Bill"')   # double-quoted argument
+Query.parse("name=='*demo*'")      # quotes do not disable equality wildcards
 ```
 
 ## Wildcard matching in equality
 
-By default, `*` in equality expressions is treated as a `LIKE` wildcard:
+By default, `*` in string equality expressions is treated as a `LIKE`
+wildcard, and `^` makes the equality case-insensitive:
 
 ```python
 Query.parse("name==*demo*")        # becomes LIKE '%demo%'
+Query.parse("name==^*DEMO*")       # case-insensitive LIKE '%DEMO%'
+Query.parse("name=in=(*)")         # exact match for a literal asterisk
 ```
 
 Disable with strict mode:

pyrsql-0.0.5/pyproject.toml

@@ -0,0 +1,233 @@
+[project]
+name = "pyrsql"
+version = "0.0.5"
+description = "Compiler-oriented RSQL query engine for safe, typed, and extensible Python ORM-backed APIs."
+readme = "README.md"
+requires-python = ">=3.11"
+license = "MIT"
+keywords = [
+    "rsql",
+    "orm",
+    "filter",
+    "pagination",
+    "sort",
+    "sqlalchemy",
+    "fastapi",
+    "rest",
+]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Environment :: Web Environment",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Information Technology",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: Free Threading",
+    "Framework :: FastAPI",
+    "Topic :: Database",
+    "Topic :: Software Development :: Compilers",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Typing :: Typed",
+]
+dependencies = ["msgspec>=0.22.0,<1.0"]
+
+[project.optional-dependencies]
+sqlalchemy = [
+    "sqlalchemy[asyncio]>=2.1,<3.0",
+    "typing-extensions>=4.10.0",
+]
+fastapi = ["fastapi>=0.150.0,<1.0"]
+
+[project.urls]
+Homepage = "https://github.com/wskr00/pyrsql"
+Repository = "https://github.com/wskr00/pyrsql"
+Issues = "https://github.com/wskr00/pyrsql/issues"
+Documentation = "https://wskr00.github.io/pyrsql/"
+
+[dependency-groups]
+lint = ["ruff>=0.15.21"]
+test = [
+    "pytest>=9.1.1",
+    "httpx>=0.28.1",
+    "pytest-cov>=7.1.0",
+    "aiosqlite>=0.21.0,<0.22.0",
+    "sqlalchemy[asyncio]>=2.1,<3.0",
+    "typing-extensions>=4.10.0",
+]
+typing = ["mypy>=2.2.0"]
+docs = [
+    "mkdocs-material>=9.7.6",
+    "mkdocstrings[python]>=1.0.5",
+]
+
+[[dependency-groups.dev]]
+include-group = "lint"
+
+[[dependency-groups.dev]]
+include-group = "test"
+
+[[dependency-groups.dev]]
+include-group = "typing"
+
+[[dependency-groups.dev]]
+include-group = "docs"
+
+[build-system]
+requires = ["uv_build>=0.13.1,<0.14.0"]
+build-backend = "uv_build"
+
+[tool.uv]
+managed = true
+
+[tool.uv.build-backend]
+source-include = [
+    "docs/**",
+    "tests/**",
+    "src/pyrsql/py.typed",
+]
+
+[tool.ruff]
+line-length = 80
+target-version = "py311"
+src = [
+    "src",
+    "tests",
+]
+fix = true
+
+[tool.ruff.lint]
+select = ["ALL"]
+preview = true
+fixable = ["ALL"]
+unfixable = ["ERA"]
+ignore = [
+    "CPY001",
+    "EM101",
+    "EM102",
+    "TRY003",
+    "COM812",
+    "ISC001",
+    "C901",
+    "PLR0913",
+    "PLR0911",
+    "PLR0912",
+]
+future-annotations = true
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.ruff.lint.flake8-annotations]
+mypy-init-return = true
+suppress-dummy-args = true
+
+[tool.ruff.lint.flake8-bugbear]
+extend-immutable-calls = [
+    "fastapi.Depends",
+    "fastapi.Query",
+    "fastapi.Path",
+    "fastapi.Header",
+    "fastapi.Cookie",
+    "fastapi.Body",
+    "fastapi.Form",
+    "fastapi.File",
+    "fastapi.Security",
+]
+
+[tool.ruff.lint.flake8-type-checking]
+exempt-modules = [
+    "typing",
+    "typing_extensions",
+]
+strict = false
+runtime-evaluated-base-classes = ["sqlalchemy.orm.DeclarativeBase"]
+runtime-evaluated-decorators = [
+    "fastapi.FastAPI.get",
+    "fastapi.FastAPI.post",
+    "fastapi.FastAPI.put",
+    "fastapi.FastAPI.patch",
+    "fastapi.FastAPI.delete",
+    "fastapi.FastAPI.options",
+    "fastapi.FastAPI.head",
+    "fastapi.FastAPI.trace",
+    "fastapi.FastAPI.api_route",
+    "fastapi.APIRouter.get",
+    "fastapi.APIRouter.post",
+    "fastapi.APIRouter.put",
+    "fastapi.APIRouter.patch",
+    "fastapi.APIRouter.delete",
+    "fastapi.APIRouter.options",
+    "fastapi.APIRouter.head",
+    "fastapi.APIRouter.trace",
+    "fastapi.APIRouter.api_route",
+]
+
+[tool.ruff.lint.isort]
+known-first-party = ["pyrsql"]
+combine-as-imports = true
+force-sort-within-sections = true
+
+[tool.ruff.lint.flake8-pytest-style]
+fixture-parentheses = false
+mark-parentheses = false
+
+[tool.ruff.lint.per-file-ignores]
+"tests/**/*.py" = [
+    "ANN",
+    "ARG",
+    "B008",
+    "DOC201",
+    "DOC501",
+    "DOC502",
+    "D",
+    "E402",
+    "FBT",
+    "PLR2004",
+    "S101",
+    "SLF001",
+]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+line-ending = "auto"
+docstring-code-format = true
+docstring-code-line-length = 80
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+pythonpath = ["src"]
+addopts = ["--import-mode=importlib"]
+markers = [
+    "unit: isolated tests",
+    "integration: interaction between components",
+    "functional: user-visible behavior",
+    "security: adversarial safety and injection-resistance tests",
+    "performance: benchmark tests",
+    "sqlalchemy: SQLAlchemy tests",
+    "fastapi: FastAPI tests",
+]
+
+[tool.mypy]
+python_version = "3.11"
+files = ["src"]
+exclude = ["^tests/"]
+strict = true
+warn_unused_configs = true
+show_error_codes = true
+pretty = true
+
+[tool.coverage.run]
+source = ["pyrsql"]
+branch = true
+
+[tool.coverage.report]
+show_missing = true
+exclude_lines = [
+    "pragma: no cover",
+    "if TYPE_CHECKING:",
+    "raise NotImplementedError",
+]

pyrsql-0.0.4/pyproject.toml → pyrsql-0.0.5/pyproject.toml.orig

@@ -1,9 +1,9 @@
 [project]
 name = "pyrsql"
-version = "0.0.4"
+version = "0.0.5"
 description = "Compiler-oriented RSQL query engine for safe, typed, and extensible Python ORM-backed APIs."
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 license = "MIT"
 keywords = ["rsql", "orm", "filter", "pagination", "sort", "sqlalchemy", "fastapi", "rest"]
 classifiers = [
@@ -12,7 +12,6 @@ classifiers = [
     "Intended Audience :: Developers",
     "Intended Audience :: Information Technology",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -25,13 +24,15 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "msgspec>=0.18,<1.0",
-    "typing-extensions>=4.10.0; python_version < '3.11'",
+    "msgspec>=0.22.0,<1.0",
 ]
 
 [project.optional-dependencies]
-sqlalchemy = ["sqlalchemy>=2.0,<3.0"]
-fastapi = ["fastapi>=0.110,<1.0"]
+sqlalchemy = [
+    "sqlalchemy[asyncio]>=2.1,<3.0",
+    "typing-extensions>=4.10.0",
+]
+fastapi = ["fastapi>=0.150.0,<1.0"]
 
 [project.urls]
 Homepage = "https://github.com/wskr00/pyrsql"
@@ -47,23 +48,24 @@ dev = [
     { include-group = "docs" },
 ]
 lint = [
-    "ruff>=0.11.0",
+    "ruff>=0.15.21",
 ]
 test = [
-    "pytest>=8.2.0",
-    "httpx>=0.27.0",
-    "pytest-cov>=5.0.0",
-    "aiosqlite>=0.20.0",
-    "sqlalchemy[asyncio]>=2.0,<3.0",
+    "pytest>=9.1.1",
+    "httpx>=0.28.1",
+    "pytest-cov>=7.1.0",
+    "aiosqlite>=0.21.0,<0.22.0",
+    "sqlalchemy[asyncio]>=2.1,<3.0",
+    "typing-extensions>=4.10.0",
 ]
-typing = ["mypy>=2.0.0"]
+typing = ["mypy>=2.2.0"]
 docs = [
-    "mkdocs-material>=9.5",
-    "mkdocstrings[python]>=0.27",
+    "mkdocs-material>=9.7.6",
+    "mkdocstrings[python]>=1.0.5",
 ]
 
 [build-system]
-requires = ["uv_build>=0.11.6,<0.12.0"]
+requires = ["uv_build>=0.13.1,<0.14.0"]
 build-backend = "uv_build"
 
 [tool.uv]
@@ -71,7 +73,7 @@ managed = true
 
 [tool.ruff]
 line-length = 80
-target-version = "py310"
+target-version = "py311"
 src = ["src", "tests"]
 fix = true
 
@@ -192,7 +194,7 @@ markers = [
 ]
 
 [tool.mypy]
-python_version = "3.10"
+python_version = "3.11"
 files = ["src"]
 exclude = ["^tests/"]
 strict = true

{pyrsql-0.0.4 → pyrsql-0.0.5}/src/pyrsql/core/json/options.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from enum import Enum
+from enum import StrEnum
 import re
 from types import MappingProxyType
 from typing import TypeAlias
@@ -14,7 +14,7 @@ _SQL_IDENTIFIER_PATTERN = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*$")
 SortFieldTypeMap: TypeAlias = Mapping[str, "JSONSortScalarType"]
 
 
-class JSONSortScalarType(str, Enum):
+class JSONSortScalarType(StrEnum):
     """Supported scalar cast strategies for JSON sort expressions."""
 
     TEXT = "text"

{pyrsql-0.0.4 → pyrsql-0.0.5}/src/pyrsql/orms/sqlalchemy/orm.py

@@ -23,7 +23,7 @@ if TYPE_CHECKING:
 
 
 class SQLAlchemyORM(base.ORM):
-    """ORM adapter for SQLAlchemy 2.0 integration."""
+    """ORM adapter for SQLAlchemy 2.1+ integration."""
 
     __slots__ = ("_sort_translator", "_translator")
 

{pyrsql-0.0.4 → pyrsql-0.0.5}/src/pyrsql/orms/sqlalchemy/translator.py

@@ -490,8 +490,8 @@ class SQLAlchemyExpressionTranslator:
         if options.strict_equality:
             return expression == value
 
-        ignore_case = value.startswith("^")
-        normalized_value = value[1:] if ignore_case else value
+        ignore_case = "^" in value
+        normalized_value = value.replace("^", "") if ignore_case else value
         if "*" in normalized_value:
             pattern = normalized_value.replace("*", "%")
             return self._build_pattern_predicate(

{pyrsql-0.0.4 → pyrsql-0.0.5}/src/pyrsql/orms/sqlalchemy/type_inference.py

@@ -22,18 +22,12 @@ def infer_sql_function_python_type(
 ) -> type[Any] | None:
     """Infers the Python type for one SQL function expression.
 
-    This helper first asks SQLAlchemy for the concrete expression type when an
-    expression is available, then falls back to cheap, explicit heuristics for
-    a small set of well-known functions.
+    This helper prefers explicit return types for known functions and argument
+    types for ``coalesce``, then asks SQLAlchemy for the expression type.
 
     Returns:
         The inferred Python type, or ``None`` when unknown.
     """
-    if function_expression is not None:
-        try:
-            return function_expression.type.python_type
-        except (AttributeError, NotImplementedError):
-            pass
     normalized_name = function_name.lower()
     known_return_type = _KNOWN_FUNCTION_RETURN_TYPES.get(normalized_name)
     if known_return_type is not None:
@@ -42,6 +36,13 @@ def infer_sql_function_python_type(
         for argument_type in argument_types:
             if argument_type is not None:
                 return argument_type
+    if function_expression is not None:
+        try:
+            inferred_type = function_expression.type.python_type
+        except (AttributeError, NotImplementedError):
+            pass
+        else:
+            return None if inferred_type is object else inferred_type
     return None
 
 

{pyrsql-0.0.4 → pyrsql-0.0.5}/src/pyrsql/parsing/lexer.py

@@ -84,13 +84,13 @@ class Lexer:
                 return self._single_char_token(TokenKind.COMMA)
             case ";":
                 return self._single_char_token(TokenKind.SEMICOLON)
-            case "'":
-                return self._consume_quoted_text()
+            case "'" | '"':
+                return self._consume_quoted_text(current_char)
             case _:
                 return self._consume_unquoted_text()
 
-    def _consume_quoted_text(self) -> Token:
-        """Consumes a single-quoted text token.
+    def _consume_quoted_text(self, quote_character: str) -> Token:
+        """Consumes a single- or double-quoted text token.
 
         Returns:
             The consumed quoted token.
@@ -103,7 +103,7 @@ class Lexer:
         characters: list[str] = []
         while not self._is_at_end():
             current_char = self._advance()
-            if current_char == "'":
+            if current_char == quote_character:
                 lexeme = "".join(characters)
                 self._enforce_argument_length(lexeme, start)
                 return self._make_token(TokenKind.QUOTED_TEXT, lexeme, start)
@@ -132,7 +132,7 @@ class Lexer:
             current_char = self._peek()
             if current_char.isspace():
                 break
-            if current_char in "(),;":
+            if current_char in "(),;'\"!~<>":
                 break
             if self._match_operator_spelling(current_char) is not None:
                 break