sqlalchemy-d1 0.1.0__tar.gz → 0.2.0__tar.gz

sqlalchemy_d1-0.2.0/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

sqlalchemy_d1-0.2.0/PKG-INFO

@@ -0,0 +1,138 @@
+Metadata-Version: 2.4
+Name: sqlalchemy-d1
+Version: 0.2.0
+Summary: SQLAlchemy dialect for Cloudflare D1
+License-Expression: Apache-2.0
+License-File: LICENSE
+Author: Chad Rossouw
+Author-email: chadrossouw7247@gmail.com
+Maintainer: Daniel Alyoshin
+Maintainer-email: daniel.alyoshin@gmail.com
+Requires-Python: >=3.11
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Topic :: Database
+Provides-Extra: dev
+Requires-Dist: mypy (>=1.18.2,<2.0.0) ; extra == "dev"
+Requires-Dist: pytest (>=8.4.2,<9.0.0) ; extra == "dev"
+Requires-Dist: pytest-socket (>=0.7.0) ; extra == "dev"
+Requires-Dist: ruff (>=0.16.8,<0.17.0) ; extra == "dev"
+Requires-Dist: sqlalchemy (>=2.0,<2.1)
+Requires-Dist: sqlalchemy-cloudflare-d1 (>=0.3.11,<0.5)
+Project-URL: Repository, https://github.com/sqlalchemy-cf-d1/sqlalchemy-d1
+Description-Content-Type: text/markdown
+
+# sqlalchemy-d1
+
+A **SQLAlchemy dialect** for **Cloudflare D1** that keeps the `d1://` connection string working in **Apache Superset**.
+
+Since version 0.2.0 this package is a thin layer over [sqlalchemy-cloudflare-d1](https://github.com/CollierKing/sqlalchemy-cloudflare-d1). That project is the real dialect and the real driver. This package registers it under the `d1` name and adds the few things Superset needs.
+
+---
+
+## Why this package exists
+
+Superset ships a built-in **Cloudflare D1** engine spec that expects `d1://` connection strings. See the [Superset D1 docs page](https://superset.apache.org/user-docs/databases/supported/cloudflare-d1/).
+
+Version 0.1.0 of this package only worked with SQLAlchemy 1.4. Superset has moved to SQLAlchemy 2.0, and its [UPDATING.md](https://github.com/apache/superset/blob/master/UPDATING.md) lists `d1` among the connectors that were held back because of that. Version 0.2.0 removes the block.
+
+If you do not use Superset, install `sqlalchemy-cloudflare-d1` directly and use its `cloudflare_d1://` connection string.
+
+---
+
+## Installation
+
+```bash
+pip install sqlalchemy-d1
+```
+
+This also installs `sqlalchemy-cloudflare-d1` and SQLAlchemy 2.0. Python 3.11 or newer is required.
+
+If your Superset still uses **SQLAlchemy 1.4** (Superset 6.1.0, for example), stay on version 0.1.0. Newer versions would upgrade SQLAlchemy and break it.
+
+```bash
+pip install "sqlalchemy-d1==0.1.0"
+```
+
+---
+
+## Usage
+
+```python
+from sqlalchemy import create_engine, text
+
+engine = create_engine("d1://<CF_ACCOUNT_ID>:<CF_API_TOKEN>@<D1_DB_ID>")
+
+with engine.connect() as conn:
+    print(conn.execute(text("SELECT 1")).scalar())
+```
+
+In Superset, use the same URL as the SQLAlchemy URI of the database connection.
+
+---
+
+## What it adds
+
+| Feature | Description |
+|---------|-------------|
+| `d1://` name | Registers the upstream dialect under the `d1` name that Superset uses. |
+| Date and boolean reflection | Columns declared as `DATETIME`, `TIMESTAMP`, `DATE`, `TIME`, `BOOLEAN` or `BOOL` are reflected as the types in `sqlalchemy_d1.types`. They behave like the upstream date and boolean types and keep the declared name. Superset reads that name to decide if a column is a date. Upstream reflects these columns as `TEXT`. |
+| `DECIMAL` reflection | Columns declared as `DECIMAL` are reflected as numeric. Upstream reflects them as `TEXT`. |
+| `autoincrement` | Reflected columns report `autoincrement`. It is true only for the column SQLite fills in by itself: a single primary key column declared as `INTEGER`, in a table that is not `WITHOUT ROWID`. |
+| Primary key order | A composite primary key is reflected in the order of the key, not the order of the columns. |
+| Schemas and views | `get_schema_names` returns `main`, `get_view_names` lists views and `get_view_definition` returns the SQL of a view. Upstream has none of these. `has_table` is also true for a view. |
+| Internal tables hidden | Tables and views that start with `_cf_`, such as `_cf_KV`, are left out of the lists. |
+
+Everything else comes from `sqlalchemy-cloudflare-d1` unchanged. That includes the connection, the cursor, the SQL compiler, and the reflection of foreign keys, indexes and unique constraints.
+
+---
+
+## Known limits
+
+Tables **created through SQLAlchemy** are identical to the ones upstream creates. A `DateTime` column is declared as `TEXT` and a `Boolean` column as `INTEGER`, so they are reflected as text and integer afterwards. Values still round trip correctly when you use the same `Table` object.
+
+Tables created with plain SQL and a `DATETIME` column, which is the normal case for D1, are reflected as dates. A table reflected from D1 keeps its declared types when SQLAlchemy creates it again on D1. On another database the same columns compile like SQLAlchemy's generic date and boolean types.
+
+Only the first word of a declared type is matched, so `TIMESTAMP WITH TIME ZONE` is a date and `UPDATED_INT` is an integer.
+
+**CHECK constraints** are not reflected. `get_check_constraints` returns an empty list, and `get_table_comment` returns no comment because SQLite has none.
+
+---
+
+## Development
+
+```bash
+python -m venv .venv
+source .venv/bin/activate
+pip install -e ".[dev]"
+```
+
+With **Poetry**, run `poetry install --all-extras` instead.
+
+Run the checks:
+
+```bash
+ruff check . && ruff format --check . && mypy src
+pytest -m "not integration" --disable-socket
+```
+
+The integration tests need a real D1 database. Use a throwaway one. They create and drop their own tables.
+
+```bash
+export CF_ACCOUNT_ID=<CF_ACCOUNT_ID>
+export CF_API_TOKEN=<CF_API_TOKEN>
+export CF_D1_DATABASE_ID=<D1_DB_ID>
+pytest -m integration
+```
+
+---
+
+## License
+
+This package is licensed under the **Apache License 2.0**. See [LICENSE](LICENSE).
+
+`sqlalchemy-cloudflare-d1` is a separate project under the MIT license. It is a dependency and none of its code is copied here.
+

sqlalchemy_d1-0.2.0/README.md

@@ -0,0 +1,110 @@
+# sqlalchemy-d1
+
+A **SQLAlchemy dialect** for **Cloudflare D1** that keeps the `d1://` connection string working in **Apache Superset**.
+
+Since version 0.2.0 this package is a thin layer over [sqlalchemy-cloudflare-d1](https://github.com/CollierKing/sqlalchemy-cloudflare-d1). That project is the real dialect and the real driver. This package registers it under the `d1` name and adds the few things Superset needs.
+
+---
+
+## Why this package exists
+
+Superset ships a built-in **Cloudflare D1** engine spec that expects `d1://` connection strings. See the [Superset D1 docs page](https://superset.apache.org/user-docs/databases/supported/cloudflare-d1/).
+
+Version 0.1.0 of this package only worked with SQLAlchemy 1.4. Superset has moved to SQLAlchemy 2.0, and its [UPDATING.md](https://github.com/apache/superset/blob/master/UPDATING.md) lists `d1` among the connectors that were held back because of that. Version 0.2.0 removes the block.
+
+If you do not use Superset, install `sqlalchemy-cloudflare-d1` directly and use its `cloudflare_d1://` connection string.
+
+---
+
+## Installation
+
+```bash
+pip install sqlalchemy-d1
+```
+
+This also installs `sqlalchemy-cloudflare-d1` and SQLAlchemy 2.0. Python 3.11 or newer is required.
+
+If your Superset still uses **SQLAlchemy 1.4** (Superset 6.1.0, for example), stay on version 0.1.0. Newer versions would upgrade SQLAlchemy and break it.
+
+```bash
+pip install "sqlalchemy-d1==0.1.0"
+```
+
+---
+
+## Usage
+
+```python
+from sqlalchemy import create_engine, text
+
+engine = create_engine("d1://<CF_ACCOUNT_ID>:<CF_API_TOKEN>@<D1_DB_ID>")
+
+with engine.connect() as conn:
+    print(conn.execute(text("SELECT 1")).scalar())
+```
+
+In Superset, use the same URL as the SQLAlchemy URI of the database connection.
+
+---
+
+## What it adds
+
+| Feature | Description |
+|---------|-------------|
+| `d1://` name | Registers the upstream dialect under the `d1` name that Superset uses. |
+| Date and boolean reflection | Columns declared as `DATETIME`, `TIMESTAMP`, `DATE`, `TIME`, `BOOLEAN` or `BOOL` are reflected as the types in `sqlalchemy_d1.types`. They behave like the upstream date and boolean types and keep the declared name. Superset reads that name to decide if a column is a date. Upstream reflects these columns as `TEXT`. |
+| `DECIMAL` reflection | Columns declared as `DECIMAL` are reflected as numeric. Upstream reflects them as `TEXT`. |
+| `autoincrement` | Reflected columns report `autoincrement`. It is true only for the column SQLite fills in by itself: a single primary key column declared as `INTEGER`, in a table that is not `WITHOUT ROWID`. |
+| Primary key order | A composite primary key is reflected in the order of the key, not the order of the columns. |
+| Schemas and views | `get_schema_names` returns `main`, `get_view_names` lists views and `get_view_definition` returns the SQL of a view. Upstream has none of these. `has_table` is also true for a view. |
+| Internal tables hidden | Tables and views that start with `_cf_`, such as `_cf_KV`, are left out of the lists. |
+
+Everything else comes from `sqlalchemy-cloudflare-d1` unchanged. That includes the connection, the cursor, the SQL compiler, and the reflection of foreign keys, indexes and unique constraints.
+
+---
+
+## Known limits
+
+Tables **created through SQLAlchemy** are identical to the ones upstream creates. A `DateTime` column is declared as `TEXT` and a `Boolean` column as `INTEGER`, so they are reflected as text and integer afterwards. Values still round trip correctly when you use the same `Table` object.
+
+Tables created with plain SQL and a `DATETIME` column, which is the normal case for D1, are reflected as dates. A table reflected from D1 keeps its declared types when SQLAlchemy creates it again on D1. On another database the same columns compile like SQLAlchemy's generic date and boolean types.
+
+Only the first word of a declared type is matched, so `TIMESTAMP WITH TIME ZONE` is a date and `UPDATED_INT` is an integer.
+
+**CHECK constraints** are not reflected. `get_check_constraints` returns an empty list, and `get_table_comment` returns no comment because SQLite has none.
+
+---
+
+## Development
+
+```bash
+python -m venv .venv
+source .venv/bin/activate
+pip install -e ".[dev]"
+```
+
+With **Poetry**, run `poetry install --all-extras` instead.
+
+Run the checks:
+
+```bash
+ruff check . && ruff format --check . && mypy src
+pytest -m "not integration" --disable-socket
+```
+
+The integration tests need a real D1 database. Use a throwaway one. They create and drop their own tables.
+
+```bash
+export CF_ACCOUNT_ID=<CF_ACCOUNT_ID>
+export CF_API_TOKEN=<CF_API_TOKEN>
+export CF_D1_DATABASE_ID=<D1_DB_ID>
+pytest -m integration
+```
+
+---
+
+## License
+
+This package is licensed under the **Apache License 2.0**. See [LICENSE](LICENSE).
+
+`sqlalchemy-cloudflare-d1` is a separate project under the MIT license. It is a dependency and none of its code is copied here.

sqlalchemy_d1-0.2.0/pyproject.toml

@@ -0,0 +1,66 @@
+[project]
+name = "sqlalchemy-d1"
+version = "0.2.0"
+description = "SQLAlchemy dialect for Cloudflare D1"
+authors = [
+    {name = "Chad Rossouw",email = "chadrossouw7247@gmail.com"},
+    {name = "Murphy Lee",email = "murphylee2004@gmail.com"},
+    {name = "Shreyas Rao",email = "raoshreyas2004@gmail.com"},
+    {name = "Alan Zhang",email = "zhangalan54@gmail.com"},
+    {name = "Daniel Alyoshin",email = "daniel.alyoshin@gmail.com"}
+]
+maintainers = [
+    {name = "Daniel Alyoshin",email = "daniel.alyoshin@gmail.com"}
+]
+readme = "README.md"
+license = "Apache-2.0"
+license-files = ["LICENSE"]
+requires-python = ">=3.11"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Database",
+]
+dependencies = [
+    "sqlalchemy>=2.0,<2.1",
+    "sqlalchemy-cloudflare-d1>=0.3.11,<0.5",
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.4.2,<9.0.0",
+    "pytest-socket>=0.7.0",
+    "ruff>=0.16.8,<0.17.0",
+    "mypy>=1.18.2,<2.0.0",
+]
+
+[project.urls]
+Repository = "https://github.com/sqlalchemy-cf-d1/sqlalchemy-d1"
+
+[project.entry-points."sqlalchemy.dialects"]
+d1 = "sqlalchemy_d1.dialect:D1Dialect"
+
+[tool.poetry]
+packages = [{include = "sqlalchemy_d1", from = "src"}]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+markers = [
+    "integration: runs against a real D1 database",
+]
+
+[tool.ruff]
+line-length = 79
+
+[tool.ruff.lint]
+select = ["E", "F", "W", "I"]
+
+[tool.ruff.lint.isort]
+combine-as-imports = true
+
+[build-system]
+requires = ["poetry-core>=2.0.0,<3.0.0"]
+build-backend = "poetry.core.masonry.api"

sqlalchemy_d1-0.2.0/src/sqlalchemy_d1/__init__.py

@@ -0,0 +1,17 @@
+"""SQLAlchemy dialect for Cloudflare D1"""
+
+from importlib.metadata import PackageNotFoundError, version
+
+from sqlalchemy.dialects import registry
+
+from .dialect import D1Dialect
+
+try:
+    __version__ = version("sqlalchemy-d1")
+except PackageNotFoundError:
+    # Running from a source tree or a vendored copy
+    __version__ = "0+unknown"
+
+__all__ = ["D1Dialect", "__version__"]
+
+registry.register("d1", "sqlalchemy_d1.dialect", "D1Dialect")

sqlalchemy_d1-0.2.0/src/sqlalchemy_d1/dialect.py

@@ -0,0 +1,171 @@
+# sqlalchemy_d1/dialect.py
+import re
+
+from sqlalchemy import exc, text, types as sqltypes
+from sqlalchemy.engine import reflection
+from sqlalchemy_cloudflare_d1.dialect import CloudflareD1Dialect
+
+from . import types as d1types
+
+INTERNAL_PREFIX = "_cf_"
+
+# Keyed by the first word of the declared type
+DECLARED_TYPES = {
+    "DATETIME": d1types.DATETIME,
+    "TIMESTAMP": d1types.TIMESTAMP,
+    "DATE": d1types.DATE,
+    "TIME": d1types.TIME,
+    "BOOLEAN": d1types.BOOLEAN,
+    "BOOL": d1types.BOOLEAN,
+    "DECIMAL": sqltypes.DECIMAL,
+}
+
+# Table options come after the last closing bracket of CREATE TABLE
+WITHOUT_ROWID = re.compile(r"\bWITHOUT\s+ROWID\b[^)]*$", re.IGNORECASE)
+
+
+def _visible(names):
+    # Cloudflare keeps its own tables, such as _cf_KV, in the same database
+    return [n for n in names if not n.startswith(INTERNAL_PREFIX)]
+
+
+class D1Dialect(CloudflareD1Dialect):
+    name = "d1"
+    supports_statement_cache = True
+
+    @reflection.cache
+    def get_schema_names(self, connection, **kwargs):
+        # D1 is built on SQLite, which only uses one schema
+        return ["main"]
+
+    @reflection.cache
+    def get_table_names(self, connection, schema=None, **kw):
+        """
+        Return list of table names in the D1 database.
+        """
+        return _visible(super().get_table_names(connection, schema, **kw))
+
+    @reflection.cache
+    def get_view_names(self, connection, schema=None, **kw):
+        """
+        Return list of view names in the D1 database.
+        """
+        result = connection.execute(
+            text(
+                "SELECT name FROM sqlite_master "
+                "WHERE type='view' ORDER BY name"
+            )
+        )
+        return _visible([row[0] for row in result])
+
+    @reflection.cache
+    def get_view_definition(self, connection, view_name, schema=None, **kw):
+        """
+        Return the CREATE VIEW statement of a view.
+        """
+        result = connection.execute(
+            text(
+                "SELECT sql FROM sqlite_master "
+                "WHERE type='view' AND name=:name"
+            ),
+            {"name": view_name},
+        )
+        row = result.first()
+        if row is None:
+            raise exc.NoSuchTableError(view_name)
+        return row[0]
+
+    @reflection.cache
+    def has_table(self, connection, table_name, schema=None, **kw):
+        """
+        Return True if a table or a view with this name exists.
+        """
+        # Upstream only looks for tables. SQLAlchemy 2.0 expects views too
+        result = connection.execute(
+            text(
+                "SELECT 1 FROM sqlite_master "
+                "WHERE type IN ('table', 'view') AND name=:name "
+                "AND name NOT LIKE 'sqlite_%'"
+            ),
+            {"name": table_name},
+        )
+        return result.first() is not None
+
+    @reflection.cache
+    def _get_table_info(self, connection, table_name, schema=None, **kw):
+        # Rows are: cid, name, type, notnull, dflt_value, pk
+        quoted = self.identifier_preparer.quote_identifier(table_name)
+        result = connection.execute(text(f"PRAGMA table_info({quoted})"))
+        return [tuple(row) for row in result]
+
+    @reflection.cache
+    def get_columns(self, connection, table_name, schema=None, **kw):
+        """
+        Return column info for a given table in D1.
+        """
+        rows = self._get_table_info(connection, table_name, schema, **kw)
+        rowid_alias = self._get_rowid_alias(connection, table_name, rows)
+        return [
+            {
+                "name": name,
+                "type": self._get_column_type(declared),
+                "nullable": not notnull,
+                "default": default,
+                "primary_key": bool(pk),
+                "autoincrement": name == rowid_alias,
+            }
+            for _cid, name, declared, notnull, default, pk in rows
+        ]
+
+    @reflection.cache
+    def get_pk_constraint(self, connection, table_name, schema=None, **kw):
+        """
+        Return the primary key columns in the order of the key.
+        """
+        rows = self._get_table_info(connection, table_name, schema, **kw)
+        # pk is the position of the column inside the key, or 0
+        pk_rows = sorted((r for r in rows if r[5]), key=lambda r: r[5])
+        return {
+            "constrained_columns": [r[1] for r in pk_rows],
+            "name": None,
+        }
+
+    def get_check_constraints(self, connection, table_name, schema=None, **kw):
+        # CHECK constraints are not reflected
+        return []
+
+    def get_table_comment(self, connection, table_name, schema=None, **kw):
+        # SQLite has no table comments
+        return {"text": None}
+
+    def _get_rowid_alias(self, connection, table_name, rows):
+        """
+        Return the name of the column that SQLite fills in by itself.
+
+        That is a single primary key column declared as exactly INTEGER,
+        in a table that is not WITHOUT ROWID.
+        """
+        pk_rows = [r for r in rows if r[5]]
+        if len(pk_rows) != 1:
+            return None
+        name, declared = pk_rows[0][1], pk_rows[0][2]
+        if (declared or "").strip().upper() != "INTEGER":
+            return None
+        table_sql = connection.execute(
+            text(
+                "SELECT sql FROM sqlite_master "
+                "WHERE type='table' AND name=:name"
+            ),
+            {"name": table_name},
+        ).scalar()
+        if WITHOUT_ROWID.search(table_sql or ""):
+            return None
+        return name
+
+    def _get_column_type(self, type_string):
+        declared = (type_string or "").upper()
+        # Only the first word counts, so UPDATED_INT stays an integer
+        first_word = re.match(r"\s*(\w*)", declared).group(1)
+        if first_word in DECLARED_TYPES:
+            return DECLARED_TYPES[first_word]()
+        return super()._get_column_type(declared)

sqlalchemy_d1-0.2.0/src/sqlalchemy_d1/types.py

@@ -0,0 +1,48 @@
+# sqlalchemy_d1/types.py
+"""
+Types that reflection returns for columns declared with a date or boolean
+type name.
+
+Each one behaves like the upstream D1 type it extends. On the d1 dialect it
+compiles to its class name, which is the name the column was declared with.
+Generic types such as DateTime are left to upstream.
+"""
+
+from sqlalchemy.ext.compiler import compiles
+from sqlalchemy_cloudflare_d1.dialect import (
+    D1Boolean,
+    D1Date,
+    D1DateTime,
+    D1Time,
+)
+
+
+class DATETIME(D1DateTime):
+    pass
+
+
+class TIMESTAMP(D1DateTime):
+    # Other dialects print TIMESTAMP too, as for sqlalchemy.TIMESTAMP
+    __visit_name__ = "TIMESTAMP"
+
+
+class DATE(D1Date):
+    pass
+
+
+class TIME(D1Time):
+    pass
+
+
+class BOOLEAN(D1Boolean):
+    pass
+
+
+# Other dialects compile these like the generic types they extend
+@compiles(DATETIME, "d1")
+@compiles(TIMESTAMP, "d1")
+@compiles(DATE, "d1")
+@compiles(TIME, "d1")
+@compiles(BOOLEAN, "d1")
+def compile_declared_name(type_, compiler, **kw):
+    return type(type_).__name__

sqlalchemy_d1-0.1.0/PKG-INFO

@@ -1,14 +0,0 @@
-Metadata-Version: 2.4
-Name: sqlalchemy-d1
-Version: 0.1.0
-Summary: 
-Author: Chad Rossouw
-Author-email: chadrossouw7247@gmail.com
-Requires-Python: >=3.11,<3.12
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: dbapi-d1 (>=0.1.0)
-Requires-Dist: sqlalchemy (>=1.4,<2)
-Description-Content-Type: text/markdown
-
-

sqlalchemy_d1-0.1.0/pyproject.toml

@@ -1,37 +0,0 @@
-[project]
-name = "sqlalchemy-d1"
-version = "0.1.0"
-description = ""
-authors = [
-    {name = "Chad Rossouw",email = "chadrossouw7247@gmail.com"},
-    {name = "Murphy Lee",email = "murphylee2004@gmail.com"},
-    {name = "Shreyas Rao",email = "raoshreyas2004@gmail.com"},
-    {name = "Alan Zhang",email = "zhangalan54@gmail.com"},
-    {name = "Daniel Alyoshin",email = "daniel.alyoshin@gmail.com"}
-]
-readme = "README.md"
-requires-python = ">=3.11,<3.12"
-dynamic = ["dependencies"]
-
-[tool.poetry]
-packages = [{include = "sqlalchemy_d1", from = "src"}]
-
-[tool.poetry.dependencies]
-python = ">=3.11,<3.12"
-sqlalchemy = ">=1.4,<2"
-dbapi-d1 = ">=0.1.0"  # published version
-
-[tool.poetry.group.dev.dependencies]
-pytest = ">=8.4.2,<9.0.0"
-black = ">=25.9.0,<26.0.0"
-mypy = ">=1.18.2,<2.0.0"
-
-[build-system]
-requires = ["poetry-core>=2.0.0,<3.0.0"]
-build-backend = "poetry.core.masonry.api"
-
-[project.entry-points."sqlalchemy.dialects"]
-d1 = "sqlalchemy_d1.dialect:D1Dialect"
-
-# [tool.poetry.plugins."sqlalchemy.dialects"]
-# d1 = "sqlalchemy_d1.dialect:D1Dialect"

sqlalchemy_d1-0.1.0/src/sqlalchemy_d1/__init__.py

@@ -1,6 +0,0 @@
-"""SQLAlchemy dialect for Cloudflare D1"""
-
-from .dialect import D1Dialect
-from sqlalchemy.dialects import registry
-
-registry.register("d1", "sqlalchemy_d1.dialect", "D1Dialect")

sqlalchemy_d1-0.1.0/src/sqlalchemy_d1/compiler.py

@@ -1,5 +0,0 @@
-from sqlalchemy.sql.compiler import SQLCompiler
-
-
-class D1Compiler(SQLCompiler):
-    pass

sqlalchemy_d1-0.1.0/src/sqlalchemy_d1/dialect.py

@@ -1,299 +0,0 @@
-# sqlalchemy_d1/dialect.py
-import dbapi_d1
-from sqlalchemy.engine.default import DefaultDialect
-from sqlalchemy import text, types as sqltypes
-from sqlalchemy.engine import reflection
-
-
-class D1Dialect(DefaultDialect):
-    name = "d1"
-    driver = "dbapi-d1"
-    supports_alter = False
-    supports_sane_rowcount = True
-    supports_sane_multi_rowcount = True
-    supports_statement_cache = True
-    paramstyle = "qmark"
-
-    def create_connect_args(self, url):
-        # URL format: d1://<account_id>:<api_token>@<database_id>
-        account_id = url.username
-        api_token = url.password
-        database_id = url.host
-        return (
-            (),
-            {
-                "account_id": account_id,
-                "api_token": api_token,
-                "database_id": database_id,
-            },
-        )
-
-    def do_ping(self, dbapi_connection) -> bool:
-        """
-        Return if the database can be reached.
-        """
-        try:
-            dbapi_connection.execute(text("SELECT 1"))
-        except Exception as ex:
-            return False
-
-        return True
-
-    def do_execute(self, cursor, statement, parameters, context=None):
-        cursor.execute(statement, parameters)
-
-    def do_on_first_connect(self, conn, branch):
-        # This is called by SQLAlchemy on the first raw connection
-        # Reset the flag so future rollbacks raise error
-        conn._first_connect = False
-
-    def import_dbapi():
-        return dbapi_d1
-
-    def dbapi():
-        return dbapi_d1
-
-    @reflection.cache
-    def get_schema_names(self, connection, **kwargs):
-        # D1 is built on SQLite, which only uses one schema
-        return ["main"]
-
-    @reflection.cache
-    def get_table_names(self, connection, schema=None, **kw):
-        """
-        Return list of table names in the D1 database.
-        """
-        try:
-            result = connection.execute(
-                text("SELECT name FROM sqlite_master WHERE type='table';")
-            )
-
-            all_tables = [row[0] for row in result.fetchall()]
-            # Filter out cloudflare tables
-            visible_tables = [t for t in all_tables if not t.startswith("_cf")]
-            return visible_tables
-        except Exception as e:
-            raise RuntimeError(f"Failed to fetch table names: {e}")
-
-    @reflection.cache
-    def get_view_names(self, connection, schema=None, **kw):
-        """
-        Return list of view names in the D1 database.
-        """
-        try:
-            result = connection.execute(
-                text("SELECT name FROM sqlite_master WHERE type='view';")
-            )
-            all_views = [row[0] for row in result.fetchall()]
-            visible_views = [v for v in all_views if not v.startswith("_cf")]
-            return visible_views
-        except Exception as e:
-            raise RuntimeError(f"Failed to fetch view names: {e}")
-
-    @reflection.cache
-    def get_columns(self, connection, table_name, schema=None, **kw):
-        """
-        Return column info for a given table in D1.
-        """
-        try:
-            query = text(f"PRAGMA table_info({table_name});")
-            result = connection.execute(query).mappings()
-            columns = []
-            for row in result.fetchall():
-                columns.append(
-                    {
-                        "name": row["name"],
-                        "type": self._resolve_type(row["type"]),
-                        "nullable": not row["notnull"],
-                        "default": row["dflt_value"],
-                        "autoincrement": row["pk"] == 1,
-                    }
-                )
-            return columns
-        except Exception as e:
-            raise RuntimeError(
-                f"Failed to fetch columns for table '{table_name}': {e}"
-            )
-
-    @reflection.cache
-    def get_primary_keys(self, connection, table_name, schema=None, **kw):
-        try:
-            query = text(f"PRAGMA table_info({table_name});")
-            result = connection.execute(query).mappings()
-            pks = [row["name"] for row in result.fetchall() if row["pk"] == 1]
-            return pks
-        except Exception as e:
-            raise RuntimeError(
-                f"Failed to fetch primary keys for table '{table_name}': {e}"
-            )
-
-    @reflection.cache
-    def get_pk_constraint(self, connection, table_name, schema=None, **kw):
-        """
-        Return the primary key for the given table as a dict with:
-        - constrained_columns: list of columns in the PK
-        - name: name of the PK constraint (SQLite doesn't store names, so None)
-        """
-        try:
-            result = connection.execute(
-                text(f"PRAGMA table_info({table_name});")
-            ).mappings()
-            pk_columns = [
-                row["name"] for row in result.fetchall() if row["pk"] != 0
-            ]
-            return {"constrained_columns": pk_columns, "name": None}
-        except Exception as e:
-            raise RuntimeError(
-                f"Failed to fetch primary key for '{table_name}': {e}"
-            )
-
-    @reflection.cache
-    def get_foreign_keys(self, connection, table_name, schema=None, **kw):
-        """
-        Return list of foreign keys for the given table.
-        Each foreign key is a dict with keys: name, constrained_columns, referred_schema,
-        referred_table, referred_columns
-        """
-        try:
-            result = connection.execute(
-                text(f"PRAGMA foreign_key_list({table_name});")
-            ).mappings()
-            fks = []
-            for row in result.fetchall():
-                fks.append(
-                    {
-                        "name": row["id"],  # SQLite assigns an integer id
-                        "constrained_columns": [row["from"]],
-                        "referred_schema": None,
-                        "referred_table": row["table"],
-                        "referred_columns": [row["to"]],
-                        "options": {
-                            "onupdate": row["on_update"],
-                            "ondelete": row["on_delete"],
-                        },
-                    }
-                )
-            return fks
-        except Exception as e:
-            raise RuntimeError(
-                f"Failed to fetch foreign keys for '{table_name}': {e}"
-            )
-
-    @reflection.cache
-    def get_indexes(self, connection, table_name, schema=None, **kw):
-        """
-        Return list of indexes for the given table.
-        Each index is a dict with keys: name, column_names, unique, primary_key
-        """
-        try:
-            result = connection.execute(
-                text(
-                    f"SELECT name, sql FROM sqlite_schema WHERE type='index' AND tbl_name='{table_name}';"
-                )
-            ).mappings()
-            indexes = []
-            for row in result.fetchall():
-                sql = row["sql"] or ""
-                indexes.append(
-                    {
-                        "name": row["name"],
-                        "column_names": self._parse_index_columns(sql),
-                        "unique": "UNIQUE" in sql.upper(),
-                        "primary_key": False,  # primary keys handled separately
-                    }
-                )
-            return indexes
-        except Exception as e:
-            raise RuntimeError(
-                f"Failed to fetch indexes for '{table_name}': {e}"
-            )
-
-    @reflection.cache
-    def get_unique_constraints(
-        self, connection, table_name, schema=None, **kw
-    ):
-        """
-        Return list of unique constraints for the table.
-        SQLite stores unique constraints as unique indexes.
-        """
-        unique_constraints = []
-        indexes = self.get_indexes(connection, table_name, schema=schema)
-        for idx in indexes:
-            if idx["unique"]:
-                unique_constraints.append(
-                    {
-                        "name": idx["name"],
-                        "column_names": idx["column_names"],
-                    }
-                )
-        return unique_constraints
-
-    # Helper to parse index columns
-    def _parse_index_columns(self, sql):
-        """
-        Extract column names from CREATE INDEX SQL statement.
-        e.g., "CREATE UNIQUE INDEX idx_name ON mytable(col1, col2)"
-        """
-        import re
-
-        m = re.search(r"\((.*?)\)", sql)
-        if m:
-            return [c.strip().strip('"') for c in m.group(1).split(",")]
-        return []
-
-    @reflection.cache
-    def has_table(self, connection, table_name, schema=None, **kw):
-        """
-        Return True if the table exists in the database.
-        """
-        try:
-            result = connection.execute(
-                text(
-                    "SELECT 1 FROM sqlite_master "
-                    "WHERE type='table' AND name=:table_name;"
-                ),
-                {"table_name": table_name},
-            )
-            return result.scalar() is not None
-        except Exception as e:
-            raise RuntimeError(
-                f"Failed to check existence of table '{table_name}': {e}"
-            )
-
-    def get_check_constraints(
-        self, connection, table_name, schema=None, **kwargs
-    ):
-        return []
-
-    def get_table_comment(self, connection, table_name, schema=None, **kwargs):
-        return {"text": ""}
-
-    def get_view_definition(
-        self, connection, view_name, schema=None, **kwargs
-    ):
-        pass
-
-    def do_rollback(self, dbapi_connection):
-        pass
-
-    def _resolve_type(self, d1_type: str):
-        """
-        Map D1/SQLite type string to SQLAlchemy type.
-        """
-        if d1_type is None:
-            return sqltypes.NullType()
-        t = d1_type.upper()
-        if "INT" in t:
-            return sqltypes.Integer()
-        elif "CHAR" in t or "CLOB" in t or "TEXT" in t:
-            return sqltypes.String()
-        elif "BLOB" in t:
-            return sqltypes.LargeBinary()
-        elif "REAL" in t or "FLOA" in t or "DOUB" in t:
-            return sqltypes.Float()
-        elif "NUMERIC" in t or "DECIMAL" in t:
-            return sqltypes.Numeric()
-        elif "BOOL" in t:
-            return sqltypes.Boolean()
-        else:
-            return sqltypes.String()  # fallback

sqlalchemy_d1-0.1.0/src/sqlalchemy_d1/type_compiler.py

@@ -1,5 +0,0 @@
-from sqlalchemy.sql.type_api import TypeEngine
-
-
-class D1TypeCompiler(TypeEngine):
-    pass