Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix support for autofields in non-default databases #784

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix support for autofields in non-default databases #784

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e02e390
fix: Support for autofields in non-default databases
untitaker Aug 9, 2022
8cf9dc4
fix: Use contribute_to_class instead
untitaker Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 17 additions & 28 deletions django_spanner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@

import pkg_resources
from google.cloud.spanner_v1 import JsonObject
from django.db.models.fields import (
NOT_PROVIDED,
AutoField,
Field,
)
from django.db.models import fields

from .expressions import register_expressions
from .functions import register_functions
Expand All @@ -35,10 +31,6 @@
USING_DJANGO_3 = True

if USING_DJANGO_3:
from django.db.models.fields import (
SmallAutoField,
BigAutoField,
)
from django.db.models import JSONField

__version__ = pkg_resources.get_distribution("django-google-spanner").version
Expand All @@ -53,34 +45,31 @@
register_functions()
register_lookups()


def gen_rand_int64():
# Credit to https://stackoverflow.com/a/3530326.
return uuid4().int & 0x7FFFFFFFFFFFFFFF

def _fix_id_generator(cls):
old_contribute_to_class = cls.contribute_to_class

def spanner_autofield_contribute_to_class(self, cls, name, **kwargs):
if self.default == fields.NOT_PROVIDED:
using = django.db.router.db_for_write(cls)
if django.db.connections[using].settings_dict["ENGINE"] == "django_spanner":
self.default = gen_rand_int64

def autofield_init(self, *args, **kwargs):
kwargs["blank"] = True
Field.__init__(self, *args, **kwargs)
return old_contribute_to_class(self, cls, name, **kwargs)

if (
django.db.connection.settings_dict["ENGINE"] == "django_spanner"
and self.default == NOT_PROVIDED
):
self.default = gen_rand_int64
cls.contribute_to_class = spanner_autofield_contribute_to_class

cls.db_returning = False
cls.validators = []

AutoField.__init__ = autofield_init
AutoField.db_returning = False
AutoField.validators = []
if USING_DJANGO_3:
SmallAutoField.__init__ = autofield_init
BigAutoField.__init__ = autofield_init
SmallAutoField.db_returning = False
BigAutoField.db_returning = False
SmallAutoField.validators = []
BigAutoField.validators = []
for field_cls_name in ("AutoField", "BigAutoField", "SmallAutoField"):
if hasattr(fields, field_cls_name):
_fix_id_generator(getattr(fields, field_cls_name))

if USING_DJANGO_3:
def get_prep_value(self, value):
# Json encoding and decoding for spanner is done in python-spanner.
if not isinstance(value, JsonObject) and isinstance(value, dict):
Expand Down