chore(django-spanner): address PR review feedback and organize skipped tests

Author: sinhasubham

packages/django-google-spanner/django_spanner/__init__.py

@@ -1,4 +1,3 @@
-# flake8: noqa: E402
 # Copyright 2020 Google LLC
 #
 # Use of this source code is governed by a BSD-style
@@ -13,13 +12,9 @@
 from uuid import uuid4
 
 import django
-
-RANDOM_ID_GENERATION_ENABLED_SETTING = "RANDOM_ID_GENERATION_ENABLED"
-
-
-from django.db import DEFAULT_DB_ALIAS  # noqa: E402
-from django.db.models import JSONField  # noqa: E402
-from django.db.models.fields import (  # noqa: E402  # noqa: E402
+from django.db import DEFAULT_DB_ALIAS
+from django.db.models import JSONField
+from django.db.models.fields import (
     NOT_PROVIDED,
     AutoField,
     BigAutoField,
@@ -31,13 +26,15 @@
 # datetime.datetime.
 from google.api_core.datetime_helpers import (
     DatetimeWithNanoseconds,
-)  # noqa: E402
-from google.cloud.spanner_v1 import JsonObject  # noqa: E402
+)
+from google.cloud.spanner_v1 import JsonObject
+
+from .functions import register_functions
+from .lookups import register_lookups
+from .utils import check_django_compatability
+from .version import __version__
 
-from .functions import register_functions  # noqa: E402
-from .lookups import register_lookups  # noqa: E402
-from .utils import check_django_compatability  # noqa: E402
-from .version import __version__  # noqa: E402
+RANDOM_ID_GENERATION_ENABLED_SETTING = "RANDOM_ID_GENERATION_ENABLED"
 
 USE_EMULATOR = os.getenv("SPANNER_EMULATOR_HOST") is not None
 
@@ -52,7 +49,6 @@
 
 def gen_rand_int64():
     # Credit to https://stackoverflow.com/a/3530326.
-    # Use 32-bit integer for Emulator compatibility (High-bit issues observed).
     return uuid4().int & 0x7FFFFFFFFFFFFFFF
 
 

packages/django-google-spanner/django_spanner/base.py

@@ -116,6 +116,9 @@ class DatabaseWrapper(BaseDatabaseWrapper):
     ops_class = DatabaseOperations
     client_class = DatabaseClient
 
+    def _get_project_id(self):
+        return os.environ.get("GOOGLE_CLOUD_PROJECT", "test-project")
+
     @property
     def instance(self):
         """Reference to a Cloud Spanner Instance containing the Database.
@@ -131,12 +134,7 @@ def instance(self):
             )
 
         if _SPANNER_CLIENT_CACHE is None:
-            _SPANNER_CLIENT_CACHE = spanner.Client(
-                project=os.environ.get("GOOGLE_CLOUD_PROJECT")
-                or self.settings_dict.get("project")
-                or self.settings_dict.get("PROJECT")
-                or "test-project"
-            )
+            _SPANNER_CLIENT_CACHE = spanner.Client(project=self._get_project_id())
 
         return _SPANNER_CLIENT_CACHE.instance(self.settings_dict["INSTANCE"])
 
@@ -158,10 +156,7 @@ def get_connection_params(self):
                   in Django Spanner format.
         """
         return {
-            "project": os.environ.get("GOOGLE_CLOUD_PROJECT")
-            or self.settings_dict.get("project")
-            or self.settings_dict.get("PROJECT")
-            or "test-project",
+            "project": self._get_project_id(),
             "instance_id": self.settings_dict["INSTANCE"],
             "database_id": self.settings_dict["NAME"],
             "user_agent": "django_spanner/2.2.0a1",

packages/django-google-spanner/django_spanner/compiler.py

@@ -48,8 +48,6 @@ def get_combinator_sql(self, combinator, all):
         """
         # This method copies the complete code of this overridden method from
         # Django core and modify it for Spanner by adding one line
-        # This method copies the complete code of this overridden method from
-        # Django core and modify it for Spanner by adding one line
         features = self.connection.features
         compilers = [
             query.get_compiler(self.using, self.connection, self.elide_empty)