querysource 5.1.1__tar.gz → 5.1.2__tar.gz

{querysource-5.1.1 → querysource-5.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: querysource
-Version: 5.1.1
+Version: 5.1.2
 Summary: Aiohttp web service for querying several databases easily
 Author-email: Jesus Lara <jesuslarag@gmail.com>
 License: BSD-3-Clause

{querysource-5.1.1 → querysource-5.1.2}/querysource/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '5.1.1'
-__version_tuple__ = version_tuple = (5, 1, 1)
+__version__ = version = '5.1.2'
+__version_tuple__ = version_tuple = (5, 1, 2)
 
-__commit_id__ = commit_id = 'g989193d59'
+__commit_id__ = commit_id = 'g09925518a'

{querysource-5.1.1 → querysource-5.1.2}/querysource/handlers/tenant.py

@@ -292,13 +292,13 @@ class TenantQueryHandler(AbstractHandler):
             if is_multi:
                 from .multi import QueryHandler
 
-                return await QueryHandler(request).query(request)
+                return await QueryHandler().query(request)
             from .service import QueryService
 
-            return await QueryService(request).query(request)
+            return await QueryService().query(request)
         from .multi import QueryHandler
 
-        handler = QueryHandler(request)
+        handler = QueryHandler()
         return await handler.query(request)
 
     async def columns(self, request: web.Request) -> web.StreamResponse:
@@ -310,10 +310,10 @@ class TenantQueryHandler(AbstractHandler):
         if is_multi:
             from .multi import QueryHandler
 
-            return await QueryHandler(request).columns(request)
+            return await QueryHandler().columns(request)
         from .service import QueryService
 
-        handler = QueryService(request)
+        handler = QueryService()
         if request.method == "HEAD":
             return await handler.get_columns(request)
         return await handler.columns(request)
@@ -327,8 +327,8 @@ class TenantQueryHandler(AbstractHandler):
         if is_multi:
             from .multi import QueryHandler
 
-            return await QueryHandler(request).test_slug(request)
+            return await QueryHandler().test_slug(request)
         from .service import QueryService
 
-        handler = QueryService(request)
+        handler = QueryService()
         return await handler.test_slug(request)

{querysource-5.1.1 → querysource-5.1.2}/querysource/services.py

@@ -404,6 +404,27 @@ class QuerySource(metaclass=Singleton):
             "/api/v1/{tenant}/queries/{slug}/test", th.test_slug
         )
         routes.append(r)
+        # Alias: /api/v1/queries/{schema}/{slug} → same tenant handler.
+        # Registered after the legacy /api/v1/queries/{slug}/describe|columns
+        # routes (same static prefix), so those keep precedence.
+        r = self.app.router.add_get(
+            "/api/v1/queries/{tenant}/{slug}", th.query, allow_head=False
+        )
+        routes.append(r)
+        r = self.app.router.add_post("/api/v1/queries/{tenant}/{slug}", th.query)
+        routes.append(r)
+        r = self.app.router.add_head("/api/v1/queries/{tenant}/{slug}", th.columns)
+        routes.append(r)
+        r = self.app.router.add_patch("/api/v1/queries/{tenant}/{slug}", th.columns)
+        routes.append(r)
+        r = self.app.router.add_get(
+            "/api/v1/queries/{tenant}/{slug}/test", th.test_slug
+        )
+        routes.append(r)
+        r = self.app.router.add_post(
+            "/api/v1/queries/{tenant}/{slug}/test", th.test_slug
+        )
+        routes.append(r)
 
         ### Startup Event for QuerySource:
         self.app.on_startup.append(

{querysource-5.1.1 → querysource-5.1.2}/querysource/version.py

@@ -6,7 +6,7 @@ __description__ = (
     'QuerySource Query parser and generator.'
     'Supports SQL, NoSQL, MongoDB, Cassandra, Elasticsearch, etc.'
 )
-__version__ = '5.1.1'
+__version__ = '5.1.2'
 __url__ = 'https://github.com/phenobarbital/querysource'
 __copyright__ = 'Copyright (c) 2018-2025 Jesus Lara'
 __author__ = 'Jesus Lara'

{querysource-5.1.1 → querysource-5.1.2}/querysource.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: querysource
-Version: 5.1.1
+Version: 5.1.2
 Summary: Aiohttp web service for querying several databases easily
 Author-email: Jesus Lara <jesuslarag@gmail.com>
 License: BSD-3-Clause

querysource-5.1.2/querysource.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "5.1.2",
+  "distance": 0,
+  "node": "g09925518a3f33669a7d026c24b06d07c830fb797",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-28"
+}

{querysource-5.1.1 → querysource-5.1.2}/tests/tenants/test_integration.py

@@ -561,7 +561,7 @@ async def test_tenant_stored_multi_definition_executes(tenant_services) -> None:
     calls: list = []
 
     class _FakeQueryHandler:
-        def __init__(self, request):
+        def __init__(self):
             pass
 
         async def query(self, request):
@@ -617,7 +617,7 @@ async def test_tenant_stored_multi_definition_executes(tenant_services) -> None:
     calls.clear()
 
     class _FakeQueryService:
-        def __init__(self, request):
+        def __init__(self):
             pass
 
         async def query(self, request):

{querysource-5.1.1 → querysource-5.1.2}/tests/tenants/test_tenant_http_routes.py

@@ -95,7 +95,7 @@ async def test_single_multi_inline_dispatch(monkeypatch) -> None:
     dispatched = {}
 
     class _FakeQueryService:
-        def __init__(self, request):
+        def __init__(self):
             pass
 
         async def query(self, request):
@@ -104,7 +104,7 @@ async def test_single_multi_inline_dispatch(monkeypatch) -> None:
             return web.json_response({"ok": "single"})
 
     class _FakeQueryHandler:
-        def __init__(self, request):
+        def __init__(self):
             pass
 
         async def query(self, request):
@@ -178,7 +178,7 @@ async def test_columns_test_and_output_suffixes(monkeypatch) -> None:
     calls = []
 
     class _FakeQueryService:
-        def __init__(self, request):
+        def __init__(self):
             pass
 
         async def get_columns(self, request):
@@ -242,3 +242,35 @@ async def test_tenant_feature_not_configured_returns_404() -> None:
     request = _mock_request(app={}, match_info={"tenant": "tenant1", "slug": "s"})
     with pytest.raises(web.HTTPNotFound):
         await handler.query(request)
+
+
+@pytest.mark.asyncio
+async def test_queries_schema_slug_alias_resolution() -> None:
+    """/api/v1/queries/{schema}/{slug} aliases the tenant route without
+    shadowing the legacy /api/v1/queries/{slug}/describe|columns routes."""
+    from aiohttp.test_utils import make_mocked_request
+
+    from querysource import services
+
+    importlib.reload(services)
+    qs = services.QuerySource(lazy=True)
+    app = web.Application()
+    qs.setup(app)
+
+    async def _resolve(method: str, path: str):
+        return await app.router.resolve(make_mocked_request(method, path))
+
+    for method in ("GET", "POST", "HEAD", "PATCH"):
+        match = await _resolve(method, "/api/v1/queries/public/lowes_stores")
+        assert match.http_exception is None
+        assert match.route.resource.canonical == "/api/v1/queries/{tenant}/{slug}"
+        assert dict(match) == {"tenant": "public", "slug": "lowes_stores"}
+
+    match = await _resolve("GET", "/api/v1/queries/public/lowes_stores/test")
+    assert match.route.resource.canonical == "/api/v1/queries/{tenant}/{slug}/test"
+
+    # Legacy two-segment routes keep precedence over the alias.
+    match = await _resolve("GET", "/api/v1/queries/lowes_stores/describe")
+    assert match.route.resource.canonical == "/api/v1/queries/{slug}/describe"
+    match = await _resolve("GET", "/api/v1/queries/lowes_stores/columns")
+    assert match.route.resource.canonical == "/api/v1/queries/{slug}/columns"

{querysource-5.1.1 → querysource-5.1.2}/tests/tenants/test_tenant_multi_dispatch.py

@@ -75,7 +75,7 @@ async def test_stored_multi_slug_dispatches_to_query_handler(monkeypatch):
     calls = []
 
     class _FakeQueryHandler:
-        def __init__(self, request):
+        def __init__(self):
             pass
 
         async def query(self, request):
@@ -103,7 +103,7 @@ async def test_stored_single_slug_dispatches_to_query_service(monkeypatch):
     calls = []
 
     class _FakeQueryService:
-        def __init__(self, request):
+        def __init__(self):
             pass
 
         async def query(self, request):
@@ -151,7 +151,7 @@ async def test_authorization_precedes_definition_load(monkeypatch):
 @pytest.mark.asyncio
 async def test_one_repository_read_per_request(monkeypatch):
     class _FakeQueryService:
-        def __init__(self, request):
+        def __init__(self):
             pass
 
         async def query(self, request):
@@ -201,11 +201,11 @@ async def test_missing_slug_returns_404_before_dispatch(monkeypatch):
     dispatched = []
 
     class _FakeQueryService:
-        def __init__(self, request):
+        def __init__(self):
             dispatched.append("service")
 
     class _FakeQueryHandler:
-        def __init__(self, request):
+        def __init__(self):
             dispatched.append("multi")
 
     monkeypatch.setattr("querysource.handlers.service.QueryService", _FakeQueryService)
@@ -255,7 +255,7 @@ async def test_slug_format_suffix_stripped_before_peek(monkeypatch):
     calls = []
 
     class _FakeQueryService:
-        def __init__(self, request):
+        def __init__(self):
             pass
 
         async def query(self, request):
@@ -280,7 +280,7 @@ async def test_multi_columns_and_test_route_dispatch(monkeypatch):
     calls = []
 
     class _FakeQueryHandler:
-        def __init__(self, request):
+        def __init__(self):
             pass
 
         async def columns(self, request):

querysource-5.1.1/querysource.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "5.1.1",
-  "distance": 0,
-  "node": "g989193d59b09c53d7dc93e1e3ff67e8dc157db17",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-25"
-}