python-datastore-sqlalchemy 0.0.1__tar.gz → 0.0.3__tar.gz

python_datastore_sqlalchemy-0.0.3/PKG-INFO

@@ -0,0 +1,95 @@
+Metadata-Version: 2.4
+Name: python-datastore-sqlalchemy
+Version: 0.0.3
+Summary: SQLAlchemy dialect for google cloud datastore
+Author-email: "HY Chang(splasky)" <hychang.1997.tw@gmail.com>
+License: MIT
+Project-URL: Documentation, https://github.com/splasky/python-datastore-sqlalchemy/wiki
+Project-URL: Source, https://github.com/splasky/python-datastore-sqlalchemy
+Project-URL: Tracker, https://github.com/splasky/python-datastore-sqlalchemy/issues
+Keywords: SQLAlchemy,GCP,Datastore
+Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Topic :: Database :: Front-Ends
+Classifier: Operating System :: POSIX :: Linux
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: sqlalchemy<3.0.0,>=1.4.16
+Requires-Dist: google-cloud-datastore>=2.21.0
+Requires-Dist: google-cloud-firestore>=2.21.0
+Requires-Dist: google-cloud-bigquery>=3.35.0
+Requires-Dist: google-auth>=2.40.0
+Requires-Dist: sqlglot>=28.0.0
+Requires-Dist: pandas>=2.0.0
+Requires-Dist: requests
+Dynamic: license-file
+
+SQLAlchemy dialect for Google Cloud Datastore in Firestore mode
+========================
+
+## Installation
+
+Install from PyPI:
+```bash
+pip install python-datastore-sqlalchemy
+```
+
+Install from a local checkout:
+```bash
+uv pip install -e .
+```
+
+Runtime dependencies are declared in `pyproject.toml`. `requirements.txt` is not used by this project.
+
+## Usage
+
+```python
+from sqlalchemy import create_engine, text
+
+engine = create_engine(
+    "datastore://my-project/?database=my-db",
+    credentials="path/to/credentials.json",
+)
+
+with engine.connect() as conn:
+    result = conn.execute(text("SELECT * FROM test_table"))
+    print(result.fetchall())
+```
+
+## Preview
+
+<img src="assets/pie.png">
+
+> [!WARNING]
+> Please note: Not all GQL and SQL syntax has been fully tested. Should you encounter any bugs, please post the relevant query and open an issue on GitHub.
+
+## How to contribute
+
+Feel free to open issues and pull requests on GitHub.
+
+## Development
+
+This project supports Python 3.10 and newer. It uses a uv-managed virtual environment by default. The lockfile is tracked so local development and CI use the same dependency resolution.
+
+Install the development environment:
+```bash
+uv sync --locked
+```
+
+Run the test suite:
+```bash
+uv run pytest
+```
+
+The Datastore-backed tests require the Google Cloud SDK with the `beta` and `cloud-datastore-emulator` components installed. If `gcloud` is not on `PATH`, point the test fixture at it explicitly:
+```bash
+GCLOUD_PATH=/path/to/google-cloud-sdk/bin/gcloud uv run pytest
+```
+
+## Development Notes
+
+- [Develop a SQLAlchemy and its dialects](https://hackmd.io/lsBW5GCVR82SORyWZ1cssA?view)

python_datastore_sqlalchemy-0.0.3/README.md

@@ -0,0 +1,65 @@
+SQLAlchemy dialect for Google Cloud Datastore in Firestore mode
+========================
+
+## Installation
+
+Install from PyPI:
+```bash
+pip install python-datastore-sqlalchemy
+```
+
+Install from a local checkout:
+```bash
+uv pip install -e .
+```
+
+Runtime dependencies are declared in `pyproject.toml`. `requirements.txt` is not used by this project.
+
+## Usage
+
+```python
+from sqlalchemy import create_engine, text
+
+engine = create_engine(
+    "datastore://my-project/?database=my-db",
+    credentials="path/to/credentials.json",
+)
+
+with engine.connect() as conn:
+    result = conn.execute(text("SELECT * FROM test_table"))
+    print(result.fetchall())
+```
+
+## Preview
+
+<img src="assets/pie.png">
+
+> [!WARNING]
+> Please note: Not all GQL and SQL syntax has been fully tested. Should you encounter any bugs, please post the relevant query and open an issue on GitHub.
+
+## How to contribute
+
+Feel free to open issues and pull requests on GitHub.
+
+## Development
+
+This project supports Python 3.10 and newer. It uses a uv-managed virtual environment by default. The lockfile is tracked so local development and CI use the same dependency resolution.
+
+Install the development environment:
+```bash
+uv sync --locked
+```
+
+Run the test suite:
+```bash
+uv run pytest
+```
+
+The Datastore-backed tests require the Google Cloud SDK with the `beta` and `cloud-datastore-emulator` components installed. If `gcloud` is not on `PATH`, point the test fixture at it explicitly:
+```bash
+GCLOUD_PATH=/path/to/google-cloud-sdk/bin/gcloud uv run pytest
+```
+
+## Development Notes
+
+- [Develop a SQLAlchemy and its dialects](https://hackmd.io/lsBW5GCVR82SORyWZ1cssA?view)

python_datastore_sqlalchemy-0.0.3/pyproject.toml

@@ -0,0 +1,88 @@
+[build-system]
+requires = ["setuptools>=64"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "python-datastore-sqlalchemy"
+version = "0.0.3"
+description = "SQLAlchemy dialect for google cloud datastore"
+readme = "README.md"
+requires-python = ">=3.10"
+license = { text = "MIT" }
+authors = [
+    { name = "HY Chang(splasky)", email = "hychang.1997.tw@gmail.com" },
+]
+classifiers = [
+    "Development Status :: 2 - Pre-Alpha",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Topic :: Database :: Front-Ends",
+    "Operating System :: POSIX :: Linux",
+]
+keywords = ["SQLAlchemy", "GCP", "Datastore"]
+dependencies = [
+    "sqlalchemy>=1.4.16,<3.0.0",
+    "google-cloud-datastore>=2.21.0",
+    "google-cloud-firestore>=2.21.0",
+    "google-cloud-bigquery>=3.35.0",
+    "google-auth>=2.40.0",
+    "sqlglot>=28.0.0",
+    "pandas>=2.0.0",
+    "requests",
+]
+
+[project.entry-points."sqlalchemy.dialects"]
+datastore = "sqlalchemy_datastore:CloudDatastoreDialect"
+
+[project.urls]
+Documentation = "https://github.com/splasky/python-datastore-sqlalchemy/wiki"
+Source = "https://github.com/splasky/python-datastore-sqlalchemy"
+Tracker = "https://github.com/splasky/python-datastore-sqlalchemy/issues"
+
+[dependency-groups]
+dev = [
+    "coverage==7.9.2",
+    "flake8==7.3.0",
+    "mypy",
+    "pytest==9.0.3",
+    "pytest-cov==6.2.1",
+    "pytest-html==4.1.1",
+    "pytest-mypy==1.0.1",
+    "pytest-ruff==0.5",
+    "ruff",
+]
+
+
+
+[tool.setuptools.packages.find]
+include = ["sqlalchemy_datastore*"]
+
+[tool.pytest.ini_options]
+addopts = "--ruff --mypy --cov --cov-report=html"
+pythonpath = ["."]
+testpaths = ["tests"]
+python_files = ["test_*.py"]
+
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.lint]
+select = ["E", "F", "W", "I", "N", "B", "C", "G", "S"]
+ignore = [
+    "E501",  # Line too long - allow longer lines for SQL strings in tests
+    "S608",  # SQL injection - intentional for test cases
+    "B007",  # Loop variable not used - common in test assertions
+]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = ["S608", "E501", "S101", "B007", "S603"]
+
+[tool.mypy]
+ignore_missing_imports = true
+disable_error_code = ["var-annotated", "import-untyped"]
+
+[[tool.mypy.overrides]]
+module = ["tests.*"]
+ignore_errors = true

python_datastore_sqlalchemy-0.0.3/python_datastore_sqlalchemy.egg-info/PKG-INFO

@@ -0,0 +1,95 @@
+Metadata-Version: 2.4
+Name: python-datastore-sqlalchemy
+Version: 0.0.3
+Summary: SQLAlchemy dialect for google cloud datastore
+Author-email: "HY Chang(splasky)" <hychang.1997.tw@gmail.com>
+License: MIT
+Project-URL: Documentation, https://github.com/splasky/python-datastore-sqlalchemy/wiki
+Project-URL: Source, https://github.com/splasky/python-datastore-sqlalchemy
+Project-URL: Tracker, https://github.com/splasky/python-datastore-sqlalchemy/issues
+Keywords: SQLAlchemy,GCP,Datastore
+Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Topic :: Database :: Front-Ends
+Classifier: Operating System :: POSIX :: Linux
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: sqlalchemy<3.0.0,>=1.4.16
+Requires-Dist: google-cloud-datastore>=2.21.0
+Requires-Dist: google-cloud-firestore>=2.21.0
+Requires-Dist: google-cloud-bigquery>=3.35.0
+Requires-Dist: google-auth>=2.40.0
+Requires-Dist: sqlglot>=28.0.0
+Requires-Dist: pandas>=2.0.0
+Requires-Dist: requests
+Dynamic: license-file
+
+SQLAlchemy dialect for Google Cloud Datastore in Firestore mode
+========================
+
+## Installation
+
+Install from PyPI:
+```bash
+pip install python-datastore-sqlalchemy
+```
+
+Install from a local checkout:
+```bash
+uv pip install -e .
+```
+
+Runtime dependencies are declared in `pyproject.toml`. `requirements.txt` is not used by this project.
+
+## Usage
+
+```python
+from sqlalchemy import create_engine, text
+
+engine = create_engine(
+    "datastore://my-project/?database=my-db",
+    credentials="path/to/credentials.json",
+)
+
+with engine.connect() as conn:
+    result = conn.execute(text("SELECT * FROM test_table"))
+    print(result.fetchall())
+```
+
+## Preview
+
+<img src="assets/pie.png">
+
+> [!WARNING]
+> Please note: Not all GQL and SQL syntax has been fully tested. Should you encounter any bugs, please post the relevant query and open an issue on GitHub.
+
+## How to contribute
+
+Feel free to open issues and pull requests on GitHub.
+
+## Development
+
+This project supports Python 3.10 and newer. It uses a uv-managed virtual environment by default. The lockfile is tracked so local development and CI use the same dependency resolution.
+
+Install the development environment:
+```bash
+uv sync --locked
+```
+
+Run the test suite:
+```bash
+uv run pytest
+```
+
+The Datastore-backed tests require the Google Cloud SDK with the `beta` and `cloud-datastore-emulator` components installed. If `gcloud` is not on `PATH`, point the test fixture at it explicitly:
+```bash
+GCLOUD_PATH=/path/to/google-cloud-sdk/bin/gcloud uv run pytest
+```
+
+## Development Notes
+
+- [Develop a SQLAlchemy and its dialects](https://hackmd.io/lsBW5GCVR82SORyWZ1cssA?view)

{python_datastore_sqlalchemy-0.0.1 → python_datastore_sqlalchemy-0.0.3}/python_datastore_sqlalchemy.egg-info/SOURCES.txt

@@ -6,7 +6,6 @@ python_datastore_sqlalchemy.egg-info/PKG-INFO
 python_datastore_sqlalchemy.egg-info/SOURCES.txt
 python_datastore_sqlalchemy.egg-info/dependency_links.txt
 python_datastore_sqlalchemy.egg-info/entry_points.txt
-python_datastore_sqlalchemy.egg-info/not-zip-safe
 python_datastore_sqlalchemy.egg-info/requires.txt
 python_datastore_sqlalchemy.egg-info/top_level.txt
 sqlalchemy_datastore/__init__.py

python_datastore_sqlalchemy-0.0.3/python_datastore_sqlalchemy.egg-info/requires.txt

@@ -0,0 +1,8 @@
+sqlalchemy<3.0.0,>=1.4.16
+google-cloud-datastore>=2.21.0
+google-cloud-firestore>=2.21.0
+google-cloud-bigquery>=3.35.0
+google-auth>=2.40.0
+sqlglot>=28.0.0
+pandas>=2.0.0
+requests

python_datastore_sqlalchemy-0.0.3/setup.py

@@ -0,0 +1,22 @@
+# Copyright (c) 2025 hychang <hychang.1997.tw@gmail.com> 
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+from setuptools import setup
+
+setup()

{python_datastore_sqlalchemy-0.0.1 → python_datastore_sqlalchemy-0.0.3}/sqlalchemy_datastore/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2025 hychang <hychang.1997.tw@gmail.com> 
+# Copyright (c) 2025 hychang <hychang.1997.tw@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -19,7 +19,7 @@
 
 from .base import CloudDatastoreDialect
 
-__version__ = "0.0.1"
+__version__ = "0.0.3"
 
 __all__ = [
     "__version__",

{python_datastore_sqlalchemy-0.0.1 → python_datastore_sqlalchemy-0.0.3}/sqlalchemy_datastore/_helpers.py

@@ -60,21 +60,23 @@ def create_datastore_client(
     user_agent: Optional[client_info.ClientInfo] = None,
     database: Optional[str] = None
 ) -> Tuple[datastore.Client, Optional[Credentials]]:
-    """Construct a BigQuery client object.
+    """Construct a Datastore client object.
 
     Args:
-        credentials_info Optional[dict]:
-        credentials_path Optional[str]:
-        credentials_base64 Optional[str]:
-        location (Optional[str]):
-            Default location for jobs / datasets / tables.
+        credentials_info (Optional[dict]):
+            Service account info dictionary.
+        credentials_path (Optional[str]):
+            Path to a service account JSON key file.
+        credentials_base64 (Optional[str]):
+            Base64-encoded service account JSON key.
         project_id (Optional[str]):
             Project ID for the project which the client acts on behalf of.
         user_agent (Optional[google.api_core.client_info.ClientInfo]):
             The client info used to send a user-agent string along with API
-            requests. If ``None``, then default info will be used. Generally,
-            you only need to set this if you're developing your own library
-            or partner tool.
+            requests. If ``None``, then default info will be used.
+        database (Optional[str]):
+            Datastore database ID. ``None`` or ``"(default)"`` uses the
+            default database.
     """
 
     default_project = None

{python_datastore_sqlalchemy-0.0.1 → python_datastore_sqlalchemy-0.0.3}/sqlalchemy_datastore/base.py

@@ -17,20 +17,15 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import logging
-from concurrent import futures
 from typing import Any, List, Optional
 
 from google.cloud import firestore_admin_v1
-from google.cloud.firestore_admin_v1.types import Database
 from google.oauth2 import service_account
 from sqlalchemy import exc
 from sqlalchemy.engine import Connection, default
 from sqlalchemy.engine.interfaces import (
-    # DBAPICursor,
-    # _DBAPISingleExecuteParams,
     ExecutionContext,
 )
-from sqlalchemy.sql import Select
 
 from . import _types, datastore_dbapi
 from ._helpers import create_datastore_client
@@ -88,6 +83,7 @@ class CloudDatastoreDialect(default.DefaultDialect):
         self.location = location
         self.identifier_preparer = self.preparer(self)
         self.dataset_id = None
+        self.database_id = None
         self.list_tables_page_size = list_tables_page_size
         self._client = None
 
@@ -129,6 +125,7 @@ class CloudDatastoreDialect(default.DefaultDialect):
             provided_job_config,
             list_tables_page_size,
             user_supplied_client,
+            database_id,
         ) = parse_url(url)
 
         self.arraysize = arraysize or self.arraysize
@@ -138,6 +135,7 @@ class CloudDatastoreDialect(default.DefaultDialect):
         self.credentials_path = credentials_path
         self.credentials_base64 = credentials_base64 or self.credentials_base64
         self.dataset_id = dataset_id
+        self.database_id = database_id
         self.billing_project_id = self.billing_project_id or self.project_id
 
         if user_supplied_client:
@@ -148,7 +146,7 @@ class CloudDatastoreDialect(default.DefaultDialect):
                 credentials_info=self.credentials_info,
                 credentials_base64=self.credentials_base64,
                 project_id=self.billing_project_id,
-                database=None,
+                database=self.database_id,
             )
             self.project_id = self.project_id if self.project_id else client.project
             self.billing_project_id = (
@@ -162,10 +160,10 @@ class CloudDatastoreDialect(default.DefaultDialect):
 
         self._client = client
         self.credentials = credentials
-        setattr(self._client, "credentials_path", self.credentials_path)
-        setattr(self._client, "credentials_info", self.credentials_info)
-        setattr(self._client, "credentials_base64", self.credentials_base64)
-        setattr(self._client, "scoped_credentials", credentials)
+        self._client.credentials_path = self.credentials_path
+        self._client.credentials_info = self.credentials_info
+        self._client.credentials_base64 = self.credentials_base64
+        self._client.scoped_credentials = credentials
         return ([], {"client": client})
 
     def get_schema_names(self, connection: Connection, **kw) -> List[str]:
@@ -182,18 +180,11 @@ class CloudDatastoreDialect(default.DefaultDialect):
 
         try:
             list_database_resp = client.list_databases(parent=parent)
-
-            def get_database_short_name(database: Database) -> Optional[List[str]]:
-                full_name = database.name
-                if full_name:
-                    return full_name.split("/")[-1]
-                return None
-
-            with futures.ThreadPoolExecutor() as executor:
-                schemas = list(
-                    executor.map(get_database_short_name, list_database_resp.databases)
-                )
-
+            schemas = [
+                full_name.split("/")[-1]
+                for db in list_database_resp.databases
+                if (full_name := db.name)
+            ]
             return schemas
         except Exception as e:
             logging.error(e)
@@ -206,57 +197,34 @@ class CloudDatastoreDialect(default.DefaultDialect):
         query = client.query(kind="__kind__")
         kinds = list(query.fetch())
 
-        def get_kind_name(kind):
-            return (
-                name
-                if (name := getattr(getattr(kind, "key", None), "name", None))
-                is not None
-                and isinstance(name, str)
-                and not name.startswith("__")
-                else None
-            )
-
-        with futures.ThreadPoolExecutor() as executor:
-            result = list(executor.map(get_kind_name, kinds))
-
-        return [t for t in result if t is not None]
+        return [
+            name
+            for kind in kinds
+            if (name := getattr(getattr(kind, "key", None), "name", None))
+            is not None
+            and isinstance(name, str)
+            and not name.startswith("__")
+        ]
 
     def get_columns(
         self, connection: Connection, table_name: str, schema: str | None = None, **kw
     ):
-        """Retrieve column information from the database with optimized parallel processing."""
+        """Retrieve column information from the database."""
         client = self._client
         query = client.query(kind="__Stat_PropertyType_PropertyName_Kind__")
         query.add_filter("kind_name", "=", table_name)
         properties = list(query.fetch())
 
-        def process_property(property):
-            return {
-                "name": property["property_name"],
-                "type": _types._property_type[property["property_type"]],
+        return [
+            {
+                "name": prop["property_name"],
+                "type": _types._property_type[prop["property_type"]],
                 "nullable": True,
                 "comment": "",
                 "default": None,
             }
-
-        with futures.ThreadPoolExecutor() as executor:
-            columns = list(executor.map(process_property, properties))
-        return columns
-
-    def _contains_select_subquery(self, node) -> bool:
-        """
-        Check the AST node contains select subquery
-        """
-        if isinstance(node, Select):
-            for child in node.get_children():
-                if isinstance(child, Select) or self._contains_select_subquery(child):
-                    return True
-
-        for child in node.get_children():
-            if isinstance(child, Select) or self._contains_select_subquery(child):
-                return True
-
-        return False
+            for prop in properties
+        ]
 
     def do_execute(
         self,

{python_datastore_sqlalchemy-0.0.1 → python_datastore_sqlalchemy-0.0.3}/sqlalchemy_datastore/datastore_dbapi.py

@@ -228,7 +228,7 @@ class Cursor:
 
         except Exception as e:
             logging.error(f"INSERT failed: {e}")
-            raise ProgrammingError(f"INSERT failed: {e}")
+            raise ProgrammingError(f"INSERT failed: {e}") from e
 
     def _execute_update(self, statement: str, parameters=None):
         """Execute an UPDATE statement using Datastore client."""
@@ -454,6 +454,8 @@ class Cursor:
             r"\bCOUNT_UP_TO\s*\(",
             r"\bSUM\s*\(",
             r"\bAVG\s*\(",
+            r"\bMIN\s*\(",
+            r"\bMAX\s*\(",
         ]
         for pattern in agg_patterns:
             if re.search(pattern, upper):
@@ -931,9 +933,14 @@ class Cursor:
         # This is a simplified evaluator for common patterns
         try:
             return self._eval_condition(context, where_clause)
-        except Exception:
-            # If evaluation fails, include the row (fail open)
-            return True
+        except Exception as e:
+            logging.warning(
+                "Client-side WHERE evaluation failed for clause '%s': %s. "
+                "Row will be excluded (fail closed).",
+                where_clause,
+                e,
+            )
+            return False
 
     def _eval_condition(self, context: Dict[str, Any], condition: str) -> bool:
         """Evaluate a single condition or compound condition."""
@@ -1566,10 +1573,12 @@ class Cursor:
         self.description = list(agg_fields.values())
 
     def execute_orm(
-        self, statement: str, parameters=None, tokens: List[tokens.Token] = []
+        self, statement: str, parameters=None, tokens: Optional[List[tokens.Token]] = None
     ):
         if parameters is None:
             parameters = {}
+        if tokens is None:
+            tokens = []
 
         logging.debug(
             f"[DataStore DBAPI] Executing ORM query: {statement} with parameters: {parameters}"
@@ -1812,11 +1821,15 @@ class Cursor:
     def fetchall(self):
         if self._closed:
             raise Error("Cursor is closed.")
+        if self._query_rows is None:
+            raise ProgrammingError("No query has been executed.")
         return list(self._query_rows)
 
     def fetchmany(self, size=None):
         if self._closed:
             raise Error("Cursor is closed.")
+        if self._query_rows is None:
+            raise ProgrammingError("No query has been executed.")
         if size is None:
             size = self.arraysize or 1
         results = []
@@ -1830,6 +1843,8 @@ class Cursor:
     def fetchone(self):
         if self._closed:
             raise Error("Cursor is closed.")
+        if self._query_rows is None:
+            raise ProgrammingError("No query has been executed.")
         try:
             return next(self._query_rows)
         except StopIteration:

{python_datastore_sqlalchemy-0.0.1 → python_datastore_sqlalchemy-0.0.3}/sqlalchemy_datastore/parse_url.py

@@ -72,6 +72,11 @@ def parse_url(url):  # noqa: C901
     credentials_base64 = None
     list_tables_page_size = None
     user_supplied_client = False
+    database = None
+
+    # database
+    if "database" in query:
+        database = query.pop("database")
 
     # location
     if "location" in query:
@@ -122,6 +127,7 @@ def parse_url(url):  # noqa: C901
                 QueryJobConfig(),
                 list_tables_page_size,
                 user_supplied_client,
+                database,
             )
         else:
             return (
@@ -134,6 +140,7 @@ def parse_url(url):  # noqa: C901
                 None,
                 list_tables_page_size,
                 user_supplied_client,
+                database,
             )
 
     job_config = QueryJobConfig()
@@ -284,4 +291,5 @@ def parse_url(url):  # noqa: C901
         job_config,
         list_tables_page_size,
         user_supplied_client,
+        database,
     )

{python_datastore_sqlalchemy-0.0.1 → python_datastore_sqlalchemy-0.0.3}/tests/test_unit_base.py

@@ -17,9 +17,12 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """Unit tests for base.py CloudDatastoreDialect (no emulator required)."""
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, patch
+
+from sqlalchemy.engine.url import make_url
 
 from sqlalchemy_datastore import CloudDatastoreDialect, datastore_dbapi
+from sqlalchemy_datastore.parse_url import parse_url
 
 # ---------------------------------------------------------------------------
 # Dialect metadata
@@ -224,3 +227,78 @@ def test_get_table_names_empty():
 
     result = d.get_table_names(None)
     assert result == []
+
+
+# ---------------------------------------------------------------------------
+# parse_url – database parameter
+# ---------------------------------------------------------------------------
+
+def test_parse_url_extracts_database():
+    url = make_url("datastore://my-project/?database=my-db")
+    result = parse_url(url)
+    assert len(result) == 10
+    assert result[9] == "my-db"
+
+
+def test_parse_url_no_database():
+    url = make_url("datastore://my-project/")
+    result = parse_url(url)
+    assert len(result) == 10
+    assert result[9] is None
+
+
+def test_parse_url_database_with_location():
+    url = make_url("datastore://my-project/?database=my-db&location=us-east1")
+    result = parse_url(url)
+    assert result[9] == "my-db"
+    assert result[1] == "us-east1"
+
+
+# ---------------------------------------------------------------------------
+# create_connect_args – database parameter
+# ---------------------------------------------------------------------------
+
+def test_create_connect_args_passes_database():
+    d = CloudDatastoreDialect()
+    url = make_url("datastore://my-project/?database=my-db")
+
+    with patch(
+        "sqlalchemy_datastore.base.create_datastore_client"
+    ) as mock_create:
+        mock_client = MagicMock()
+        mock_client.project = "my-project"
+        mock_create.return_value = (mock_client, MagicMock())
+
+        d.create_connect_args(url)
+
+        mock_create.assert_called_once_with(
+            credentials_path=None,
+            credentials_info=None,
+            credentials_base64=None,
+            project_id="my-project",
+            database="my-db",
+        )
+        assert d.database_id == "my-db"
+
+
+def test_create_connect_args_no_database():
+    d = CloudDatastoreDialect()
+    url = make_url("datastore://my-project/")
+
+    with patch(
+        "sqlalchemy_datastore.base.create_datastore_client"
+    ) as mock_create:
+        mock_client = MagicMock()
+        mock_client.project = "my-project"
+        mock_create.return_value = (mock_client, MagicMock())
+
+        d.create_connect_args(url)
+
+        mock_create.assert_called_once_with(
+            credentials_path=None,
+            credentials_info=None,
+            credentials_base64=None,
+            project_id="my-project",
+            database=None,
+        )
+        assert d.database_id is None

python_datastore_sqlalchemy-0.0.1/PKG-INFO

@@ -1,65 +0,0 @@
-Metadata-Version: 2.4
-Name: python-datastore-sqlalchemy
-Version: 0.0.1
-Summary: SQLAlchemy dialect for google cloud datastore
-Home-page: https://github.com/splasky/python-datastore-sqlalchemy
-Author: HY Chang(splasky)
-Author-email: hychang.1997.tw@gmail.com
-License: MIT
-Project-URL: Documentation, https://github.com/splasky/python-datastore-sqlalchemy/wiki
-Project-URL: Source, https://github.com/splasky/python-datastore-sqlalchemy
-Project-URL: Tracker, https://github.com/splasky/python-datastore-sqlalchemy/issues
-Keywords: SQLAlchemy GCP Datastore
-Classifier: Development Status :: 2 - Pre-Alpha
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Topic :: Database :: Front-Ends
-Classifier: Operating System :: POSIX :: Linux
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: sqlalchemy<3.0.0,>=1.4.16
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: license-file
-Dynamic: project-url
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
-SQLAlchemy dialect for google cloud datastore(firestore mode)
-========================
-How to install
-```
-python3 setup.py install
-```
-How to use
-```python
-from sqlalchemy import *
-from sqlalchemy.engine import create_engine
-from sqlalchemy.schema import *
-engine = create_engine('datastore://test-api-1', credentials='path/to/credentials.json')
-conn = engine.connect()
-result = conn.execute("SELECT * from test_table)
-print(result.fetchall())
-```
-
-## Preview
-<img src="assets/pie.png">
-
-> [!WARNING]
-> Please note: Not all GQL and SQL syntax has been fully tested. Should you encounter any bugs, please post the relevant query and open an issue on GitHub.
-
-## How to contribute
-Feel free to open issues and pull requests on GitHub.
-
-## Development Notes
-- [Develop a SQLAlchemy and it's dialects](https://hackmd.io/lsBW5GCVR82SORyWZ1cssA?view)

python_datastore_sqlalchemy-0.0.1/README.md

@@ -1,28 +0,0 @@
-SQLAlchemy dialect for google cloud datastore(firestore mode)
-========================
-How to install
-```
-python3 setup.py install
-```
-How to use
-```python
-from sqlalchemy import *
-from sqlalchemy.engine import create_engine
-from sqlalchemy.schema import *
-engine = create_engine('datastore://test-api-1', credentials='path/to/credentials.json')
-conn = engine.connect()
-result = conn.execute("SELECT * from test_table)
-print(result.fetchall())
-```
-
-## Preview
-<img src="assets/pie.png">
-
-> [!WARNING]
-> Please note: Not all GQL and SQL syntax has been fully tested. Should you encounter any bugs, please post the relevant query and open an issue on GitHub.
-
-## How to contribute
-Feel free to open issues and pull requests on GitHub.
-
-## Development Notes
-- [Develop a SQLAlchemy and it's dialects](https://hackmd.io/lsBW5GCVR82SORyWZ1cssA?view)

python_datastore_sqlalchemy-0.0.1/pyproject.toml

@@ -1,21 +0,0 @@
-[tool.ruff]
-line-length = 120
-
-[tool.ruff.lint]
-select = ["E", "F", "W", "I", "N", "B", "C", "G", "S"]
-ignore = [
-    "E501",  # Line too long - allow longer lines for SQL strings in tests
-    "S608",  # SQL injection - intentional for test cases
-    "B007",  # Loop variable not used - common in test assertions
-]
-
-[tool.ruff.lint.per-file-ignores]
-"tests/*" = ["S608", "E501", "S101", "B007", "S603"]
-
-[tool.mypy]
-ignore_missing_imports = true
-disable_error_code = ["var-annotated", "import-untyped"]
-
-[[tool.mypy.overrides]]
-module = ["tests.*", "sqlalchemy_datastore.*"]
-ignore_errors = true

python_datastore_sqlalchemy-0.0.1/python_datastore_sqlalchemy.egg-info/PKG-INFO

@@ -1,65 +0,0 @@
-Metadata-Version: 2.4
-Name: python-datastore-sqlalchemy
-Version: 0.0.1
-Summary: SQLAlchemy dialect for google cloud datastore
-Home-page: https://github.com/splasky/python-datastore-sqlalchemy
-Author: HY Chang(splasky)
-Author-email: hychang.1997.tw@gmail.com
-License: MIT
-Project-URL: Documentation, https://github.com/splasky/python-datastore-sqlalchemy/wiki
-Project-URL: Source, https://github.com/splasky/python-datastore-sqlalchemy
-Project-URL: Tracker, https://github.com/splasky/python-datastore-sqlalchemy/issues
-Keywords: SQLAlchemy GCP Datastore
-Classifier: Development Status :: 2 - Pre-Alpha
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Topic :: Database :: Front-Ends
-Classifier: Operating System :: POSIX :: Linux
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: sqlalchemy<3.0.0,>=1.4.16
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: license-file
-Dynamic: project-url
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
-SQLAlchemy dialect for google cloud datastore(firestore mode)
-========================
-How to install
-```
-python3 setup.py install
-```
-How to use
-```python
-from sqlalchemy import *
-from sqlalchemy.engine import create_engine
-from sqlalchemy.schema import *
-engine = create_engine('datastore://test-api-1', credentials='path/to/credentials.json')
-conn = engine.connect()
-result = conn.execute("SELECT * from test_table)
-print(result.fetchall())
-```
-
-## Preview
-<img src="assets/pie.png">
-
-> [!WARNING]
-> Please note: Not all GQL and SQL syntax has been fully tested. Should you encounter any bugs, please post the relevant query and open an issue on GitHub.
-
-## How to contribute
-Feel free to open issues and pull requests on GitHub.
-
-## Development Notes
-- [Develop a SQLAlchemy and it's dialects](https://hackmd.io/lsBW5GCVR82SORyWZ1cssA?view)

python_datastore_sqlalchemy-0.0.1/python_datastore_sqlalchemy.egg-info/not-zip-safe

@@ -1 +0,0 @@
-

python_datastore_sqlalchemy-0.0.1/python_datastore_sqlalchemy.egg-info/requires.txt

@@ -1 +0,0 @@
-sqlalchemy<3.0.0,>=1.4.16

python_datastore_sqlalchemy-0.0.1/setup.py

@@ -1,70 +0,0 @@
-# Copyright (c) 2025 hychang <hychang.1997.tw@gmail.com> 
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-import os
-import re
-
-from setuptools import setup, find_packages
-
-v = open(
-    os.path.join(os.path.dirname(__file__), "sqlalchemy_datastore", "__init__.py")
-)
-version_match = re.compile(r'.*__version__ = "(.*?)"', re.S).match(v.read())
-if not version_match:
-    raise RuntimeError("Unable to find version string in __init__.py.")
-VERSION = version_match.group(1)
-v.close()
-
-readme = os.path.join(os.path.dirname(__file__), "README.md")
-
-
-setup(
-    name="python-datastore-sqlalchemy",
-    version=VERSION,
-    description="SQLAlchemy dialect for google cloud datastore",
-    long_description=open(readme).read(),
-    long_description_content_type="text/markdown",
-    url="https://github.com/splasky/python-datastore-sqlalchemy",
-    author="HY Chang(splasky)",
-    author_email="hychang.1997.tw@gmail.com",
-    license="MIT",
-    classifiers=[
-        "Development Status :: 2 - Pre-Alpha",
-        "Intended Audience :: Developers",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: Implementation :: CPython",
-        "Topic :: Database :: Front-Ends",
-        "Operating System :: POSIX :: Linux",
-    ],
-    keywords="SQLAlchemy GCP Datastore",
-    python_requires=">=3.9",
-    project_urls={
-        "Documentation": "https://github.com/splasky/python-datastore-sqlalchemy/wiki",
-        "Source": "https://github.com/splasky/python-datastore-sqlalchemy",
-        "Tracker": "https://github.com/splasky/python-datastore-sqlalchemy/issues",
-    },
-    packages=find_packages(include=["sqlalchemy_datastore"]),
-    include_package_data=True,
-    install_requires=["sqlalchemy>=1.4.16,<3.0.0",],
-    zip_safe=False,
-    entry_points={
-        "sqlalchemy.dialects": ["datastore = sqlalchemy_datastore:CloudDatastoreDialect"]
-    },
-)