Add example blog app

G4brym · G4brym · commit 0481f813ce13 · 2025-07-06T16:07:25.000+01:00
diff --git a/django_cf/d1_api/base.py b/django_cf/d1_api/base.py
@@ -11,7 +11,7 @@
 
 
 class DatabaseWrapper(SQLiteDatabaseWrapper):
-    vendor = "sqlite"
+    vendor = "cloudflare_d1"
     display_name = "D1"
 
     Database = Database
diff --git a/django_cf/d1_binding/base.py b/django_cf/d1_binding/base.py
@@ -11,7 +11,7 @@
 
 
 class DatabaseWrapper(SQLiteDatabaseWrapper):
-    vendor = "sqlite"
+    vendor = "cloudflare_d1"
     display_name = "D1"
 
     Database = Database
diff --git a/django_cf/d1_binding/database.py b/django_cf/d1_binding/database.py
@@ -1,12 +1,7 @@
-import json
-import http.client
-import datetime
-import re
+import sqlparse
 
 from django.db import DatabaseError, Error, DataError, OperationalError, \
 IntegrityError, InternalError, ProgrammingError, NotSupportedError, InterfaceError
-from django.conf import settings
-from django.utils import timezone
 
 class D1Result:
     lastrowid = None
@@ -121,81 +116,68 @@ def process_query(self, query, params=None):
     def run_query(self, query, params=None):
         proc_query, params = self.process_query(query, params)
 
-        # print(query)
-        # print(params)
-
         cf_workers = self.import_from_javascript("cloudflare:workers")
-        # print(dir(cf_workers.env))
         db = getattr(cf_workers.env, self.binding)
 
         if params:
             stmt = db.prepare(proc_query).bind(*params);
         else:
             stmt = db.prepare(proc_query);
 
+        read_only = is_read_only_query(proc_query)
+
         try:
-            resp = self.run_sync(stmt.all())
+            if read_only:
+                resp = self.run_sync(stmt.raw())
+            else:
+                resp = self.run_sync(stmt.all())
         except:
             from js import Error
             Error.stackTraceLimit = 1e10
             raise Error(Error.new().stack)
 
-        results = self._convert_results(resp.results.to_py())
-
-        # print(results)
-        # print(f'rowsRead: {resp.meta.rows_read}')
-        # print(f'rowsWritten: {resp.meta.rows_written}')
-        # print('---')
+        # this is a hack, because D1 Raw method (required for reading rows) doesn't return metadata
+        if read_only:
+            results = self._convert_results_list(resp.to_py())
+            rows_read = len(results)
+            rows_written = 0
+        else:
+            results = self._convert_results_dict(resp.results.to_py())
+            rows_read = resp.meta.rows_read
+            rows_written = resp.meta.rows_written
 
         return results, {
-            "rows_read": resp.meta.rows_read,
-            "rows_written": resp.meta.rows_written,
+            "rows_read": rows_read,
+            "rows_written": rows_written,
         }
 
-    def _convert_results(self, data):
-        """
-        Convert any datetime strings in the result set to actual timezone-aware datetime objects.
-        """
-        # print('before')
-        # print(data)
+    def _convert_results_dict(self, data):
         result = []
 
         for row in data:
             row_items = ()
             for k, v in row.items():
-                if isinstance(v, str):
-                    v = self._parse_datetime(v)
                 row_items += (v,)
 
             result.append(row_items)
 
-        # print('after')
-        # print(result)
+        return result
+
+    def _convert_results_list(self, data):
+        result = []
+
+        for row in data:
+            row_items = ()
+            for v in row:
+                row_items += (v,)
+
+            result.append(row_items)
+
         return result
 
     query = None
     params = None
 
-    def _parse_datetime(self, value):
-        """
-        Parse the string value to a timezone-aware datetime object, if applicable.
-        Handles both datetime strings with and without milliseconds.
-        Uses Django's timezone utilities for proper conversion.
-        """
-        datetime_formats = ["%Y-%m-%d %H:%M:%S.%f", "%Y-%m-%d %H:%M:%S"]
-
-        for dt_format in datetime_formats:
-            try:
-                naive_dt = datetime.datetime.strptime(value, dt_format)
-                # If Django is using timezones, convert to an aware datetime object
-                if timezone.is_naive(naive_dt):
-                    return timezone.make_aware(naive_dt, timezone.get_default_timezone())
-                return naive_dt
-            except (ValueError, TypeError):
-                continue  # Try the next format if parsing fails
-
-        return value  # If it's not a datetime string, return the original value
-
     def execute(self, query, params=None):
         if params:
             newParams = []
@@ -252,3 +234,22 @@ def fetchmany(self, size=1):
 
     def close(self):
         return
+
+
+def is_read_only_query(query: str) -> bool:
+    parsed = sqlparse.parse(query.strip())
+
+    if not parsed:
+        return False  # Invalid or empty query
+
+    # Get the first statement
+    statement = parsed[0]
+
+    # Check if the statement is a SELECT query
+    if statement.get_type().upper() == "SELECT":
+        return True
+
+    # List of modifying query types
+    modifying_types = {"INSERT", "UPDATE", "DELETE", "CREATE", "ALTER", "DROP", "REPLACE"}
+
+    return statement.get_type().upper() not in modifying_types
diff --git a/django_cf/do_binding/base.py b/django_cf/do_binding/base.py
@@ -11,7 +11,7 @@
 
 
 class DatabaseWrapper(SQLiteDatabaseWrapper):
-    vendor = "sqlite"
+    vendor = "cloudflare_durable_objects"
     display_name = "DO"
 
     Database = Database
diff --git a/templates/d1/src/app/settings.py b/templates/d1/src/app/settings.py
@@ -37,6 +37,8 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+
+    'blog'
 ]
 
 MIDDLEWARE = [
@@ -54,7 +56,9 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [
+            BASE_DIR.joinpath('templates')
+        ],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
diff --git a/templates/d1/src/app/urls.py b/templates/d1/src/app/urls.py
@@ -18,7 +18,7 @@
 from django.contrib.auth import get_user_model
 from django.core.management import call_command
 from django.http import JsonResponse
-from django.urls import path
+from django.urls import path, include
 from django.contrib.auth.decorators import user_passes_test
 
 def is_superuser(user):
@@ -44,10 +44,13 @@ def run_migrations_view(request):
         call_command("migrate")
         return JsonResponse({"status": "success", "message": "Migrations applied."})
     except Exception as e:
+        raise e
         return JsonResponse({"status": "error", "message": str(e)}, status=500)
 
 
 urlpatterns = [
+    path('', include('blog.urls')),
+
     path('admin/', admin.site.urls),
     # Management endpoints - secure these appropriately for your application
     path('__create_admin__/', create_admin_view, name='create_admin'),
diff --git a/templates/d1/src/blog/__init__.py b/templates/d1/src/blog/__init__.py
diff --git a/templates/d1/src/blog/admin.py b/templates/d1/src/blog/admin.py
@@ -0,0 +1,4 @@
+from django.contrib import admin
+from .models import Post
+
+admin.site.register(Post)
diff --git a/templates/d1/src/blog/apps.py b/templates/d1/src/blog/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class BlogConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'blog'
diff --git a/templates/d1/src/blog/migrations/0001_initial.py b/templates/d1/src/blog/migrations/0001_initial.py
@@ -0,0 +1,37 @@
+# Generated by Django 5.1.2 on 2025-07-06 13:30
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+def insert_dummy_blog_post(apps, schema_editor):
+    Post = apps.get_model('blog', 'Post')
+
+    # Insert the record
+    Post.objects.create(
+        title='Example Post',
+        content="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."
+    )
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Post',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('content', models.TextField()),
+                ('pub_date', models.DateTimeField(default=django.utils.timezone.now)),
+            ],
+        ),
+        migrations.RunPython(
+            code=insert_dummy_blog_post,
+        ),
+    ]
diff --git a/templates/d1/src/blog/migrations/__init__.py b/templates/d1/src/blog/migrations/__init__.py
diff --git a/templates/d1/src/blog/models.py b/templates/d1/src/blog/models.py
@@ -0,0 +1,10 @@
+from django.db import models
+from django.utils import timezone
+
+class Post(models.Model):
+    title = models.CharField(max_length=200)
+    content = models.TextField()
+    pub_date = models.DateTimeField(default=timezone.now)
+
+    def __str__(self):
+        return self.title
diff --git a/templates/d1/src/blog/static/css/style.css b/templates/d1/src/blog/static/css/style.css
@@ -0,0 +1,37 @@
+body {
+    font-family: Arial, sans-serif;
+    max-width: 800px;
+    margin: 0 auto;
+    padding: 20px;
+}
+
+header {
+    text-align: center;
+    border-bottom: 1px solid #ccc;
+    margin-bottom: 20px;
+}
+
+nav a {
+    margin-right: 10px;
+    text-decoration: none;
+    color: #007bff;
+}
+
+article {
+    margin-bottom: 20px;
+    padding-bottom: 20px;
+    border-bottom: 1px solid #eee;
+}
+
+h2, h3 {
+    color: #333;
+}
+
+a {
+    color: #007bff;
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
diff --git a/templates/d1/src/blog/tests.py b/templates/d1/src/blog/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/templates/d1/src/blog/urls.py b/templates/d1/src/blog/urls.py
@@ -0,0 +1,11 @@
+from django.urls import path
+from django.views.generic import TemplateView
+
+from . import views
+
+app_name = 'blog'
+urlpatterns = [
+    path('', TemplateView.as_view(template_name='landing.html'), name='landing'),
+    path('blog/', views.post_list, name='post_list'),
+    path('blog/post/<int:pk>/', views.post_detail, name='post_detail'),
+]
diff --git a/templates/d1/src/blog/views.py b/templates/d1/src/blog/views.py
@@ -0,0 +1,10 @@
+from django.shortcuts import render, get_object_or_404
+from .models import Post
+
+def post_list(request):
+    posts = Post.objects.order_by('-pub_date')
+    return render(request, 'blog/post_list.html', {'posts': posts})
+
+def post_detail(request, pk):
+    post = get_object_or_404(Post, pk=pk)
+    return render(request, 'blog/post_detail.html', {'post': post})
diff --git a/templates/d1/src/templates/blog/base.html b/templates/d1/src/templates/blog/base.html
@@ -0,0 +1,22 @@
+{% load static %}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{% block title %}My Blog{% endblock %}</title>
+    <link rel="stylesheet" href="{% static 'css/style.css' %}">
+</head>
+<body>
+    <header>
+        <h1>My Blog</h1>
+        <nav>
+            <a href="{% url 'blog:post_list' %}">Home</a>
+        </nav>
+    </header>
+    <main>
+        {% block content %}
+        {% endblock %}
+    </main>
+</body>
+</html>
diff --git a/templates/d1/src/templates/blog/post_detail.html b/templates/d1/src/templates/blog/post_detail.html
@@ -0,0 +1,12 @@
+{% extends 'blog/base.html' %}
+
+{% block title %}{{ post.title }}{% endblock %}
+
+{% block content %}
+    <article>
+        <h2>{{ post.title }}</h2>
+        <p>Published: {{ post.pub_date|date:"F d, Y" }}</p>
+        <p>{{ post.content }}</p>
+        <a href="{% url 'blog:post_list' %}">Back to posts</a>
+    </article>
+{% endblock %}
diff --git a/templates/d1/src/templates/blog/post_list.html b/templates/d1/src/templates/blog/post_list.html
@@ -0,0 +1,15 @@
+{% extends 'blog/base.html' %}
+
+{% block title %}Blog Posts{% endblock %}
+
+{% block content %}
+    <h2>Blog Posts</h2>
+    {% for post in posts %}
+        <article>
+            <h3><a href="{% url 'blog:post_detail' post.pk %}">{{ post.title }}</a></h3>
+            <p>Published: {{ post.pub_date|date:"F d, Y" }}</p>
+        </article>
+    {% empty %}
+        <p>No posts available.</p>
+    {% endfor %}
+{% endblock %}
diff --git a/templates/d1/src/templates/landing.html b/templates/d1/src/templates/landing.html
diff --git a/templates/d1/templates/blog/base.html b/templates/d1/templates/blog/base.html
diff --git a/templates/d1/templates/blog/post_details.html b/templates/d1/templates/blog/post_details.html
diff --git a/templates/d1/templates/blog/post_list.html b/templates/d1/templates/blog/post_list.html
diff --git a/templates/d1/wrangler.jsonc b/templates/d1/wrangler.jsonc
