From 103941aaaaf55f045fa081936d81bfec6b4942d2 Mon Sep 17 00:00:00 2001
From: Gabriel Massadas <gmassadas@cloudflare.com>
Date: Sun, 10 Nov 2024 11:53:13 +0000
Subject: [PATCH] Fix query building edgecases, to support Wagtail on
 workers-dbms

---
 django_dbms/base.py | 9 +++++++++
 pyproject.toml      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/django_dbms/base.py b/django_dbms/base.py
index d814f14..035728d 100644
--- a/django_dbms/base.py
+++ b/django_dbms/base.py
@@ -27,11 +27,20 @@ class DatabaseFeatures(SQLiteDatabaseFeatures):
 
 class DatabaseOperations(SQLiteDatabaseOperations):
     pragma_foreign_keys = None
+    cast_data_types = {
+        "DateField": "TEXT",
+        "DateTimeField": "TEXT",
+        "PositiveIntegerField": "INTEGER",
+    }
 
     def _quote_columns(self, sql):
         """
         Ensure column names are properly quoted and aliased to avoid collisions.
+        Also handles CAST statements properly for NULL values.
         """
+        # First, fix any problematic CAST statements with None
+        sql = sql.replace('None(', '(')
+
         parsed = sqlparse.parse(sql)
         if not parsed:
             return sql  # Unable to parse, return original SQL
diff --git a/pyproject.toml b/pyproject.toml
index 7675202..7bcb2de 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "django-cf"
-version = "0.0.16"
+version = "0.0.17"
 authors = [
   { name="Gabriel Massadas" },
 ]