Update GaussDB Django backend with enhanced schema editor, refined database features, and expanded test apps

Author: pangpang20

django_test_apps.txt

@@ -1,4 +1,142 @@
 admin_changelist
+admin_custom_urls
+admin_docs
+admin_filters
+admin_inlines
+admin_ordering
+admin_utils
 admin_views
 aggregation
-aggregation_regress
+aggregation_regress
+annotations
+auth_tests
+backends
+basic
+bulk_create
+cache
+check_framework
+conditional_processing
+constraints
+contenttypes_tests
+custom_columns
+custom_lookups
+custom_managers
+custom_methods
+custom_migration_operations
+custom_pk
+datatypes
+dates
+datetimes
+db_typecasts
+db_utils
+db_functions
+defer
+defer_regress
+delete
+delete_regress
+distinct_on_fields
+empty
+expressions_case
+expressions_window
+extra_regress
+field_subclassing
+file_storage
+file_uploads
+filtered_relation
+fixtures
+fixtures_model_package
+fixtures_regress
+force_insert_update
+foreign_object
+forms_tests
+from_db_value
+generic_inline_admin
+generic_relations
+generic_relations_regress
+generic_views
+get_earliest_or_latest
+get_object_or_404
+get_or_create
+i18n
+indexes
+inline_formsets
+inspectdb
+introspection
+invalid_models_tests
+known_related_objects
+lookup
+m2m_and_m2o
+m2m_intermediary
+m2m_multiple
+m2m_recursive
+m2m_regress
+m2m_signals
+m2m_through
+m2m_through_regress
+m2o_recursive
+managers_regress
+many_to_many
+many_to_one
+many_to_one_null
+max_lengths
+migrate_signals
+migration_test_data_persistence
+migrations
+model_fields
+model_forms
+model_formsets
+model_formsets_regress
+model_indexes
+model_inheritance
+model_inheritance_regress
+model_meta
+model_options
+model_package
+model_regress
+modeladmin
+null_fk
+null_fk_ordering
+null_queries
+one_to_one
+or_lookups
+order_with_respect_to
+ordering
+pagination
+prefetch_related
+properties
+proxy_model_inheritance
+proxy_models
+queries
+queryset_pickle
+raw_query
+reserved_names
+reverse_lookup
+save_delete_hooks
+schema
+select_for_update
+select_related
+select_related_onetoone
+select_related_regress
+serializers
+servers
+signals
+sitemaps_tests
+sites_framework
+sites_tests
+string_lookup
+swappable_models
+syndication_tests
+test_client
+test_client_regress
+test_utils
+timezones
+transaction_hooks
+transactions
+unmanaged_models
+update
+update_only_fields
+validation
+view_tests
+nested_foreign_keys
+mutually_referential
+multiple_database

gaussdb_django/base.py

@@ -63,7 +63,6 @@ def _get_varchar_column(data):
         return "varchar"
     return "varchar(%(max_length)s)" % data
 
-
 class DatabaseWrapper(BaseDatabaseWrapper):
     vendor = "gaussdb"
     display_name = "GaussDB"
@@ -80,6 +79,7 @@ def patched_get_prep_value(self, value):
         models.TextField.get_prep_value = patched_get_prep_value
 
 
+
     # This dictionary maps Field objects to their associated Gaussdb column
     # types, as strings. Column-type strings can contain format strings; they'll
     # be interpolated against the values of Field.__dict__ before being output.
@@ -169,6 +169,7 @@ def patched_get_prep_value(self, value):
     features_class = DatabaseFeatures
     introspection_class = DatabaseIntrospection
     ops_class = DatabaseOperations
+
     # Gaussdb backend-specific attributes.
     _named_cursor_idx = 0
 
@@ -546,12 +547,15 @@ def copy(self, statement):
 
 def safe_model_repr(self):
     try:
+        if isinstance(self, ModelBase):
+            return f"<class '{self.__module__}.{self.__name__}'>"
+
         s = str(self)
         if not isinstance(s, str):
-            s = f"{self.__class__.__name__} #{self.pk or 'unsaved'}"
+            s = f"{self.__class__.__name__} #{getattr(self, 'pk', 'unsaved')}"
         return f"<{self.__class__.__name__}: {s}>"
     except Exception as e:
-        return f"<{self.__class__.__name__}: instance (error: {str(e)})>"
+        return f"<{self.__class__.__name__}: instance (error: {e})>"
 
 ModelBase.__repr__ = safe_model_repr
 
@@ -561,8 +565,7 @@ def execute(self, sql, params=None):
         try:
             return super().execute(sql, params)
         except errors.UniqueViolation as e:
-            print(f">>>>CursorWrapper")
             if "aggregation_author_frien" in str(e):
                 sql = sql.replace("INSERT INTO", "INSERT INTO ... ON CONFLICT DO NOTHING")
                 return super().execute(sql, params)
-            raise
+            raise

gaussdb_django/compiler.py

@@ -6,10 +6,8 @@
 from django.db.models.sql.compiler import SQLInsertCompiler as BaseSQLInsertCompiler
 from django.db.models.sql.compiler import SQLUpdateCompiler
 from django.db.models.sql.compiler import SQLCompiler as BaseSQLCompiler
-# from django.db.models.functions import JSONArray, JSONObject
+from django.db.models.functions import JSONObject
 from django.db.models import IntegerField, FloatField, Func
-# from django.db.models.fields.related_descriptors import ManyToManyDescriptor as BaseManyToManyDescriptor
-
 
 
 __all__ = [
@@ -39,14 +37,6 @@ def assemble_as_sql(self, fields, value_rows):
     def as_sql(self):
         return super().as_sql()
 
-    # def execute_sql(self, returning_fields=None):
-    #     sql, params = self.as_sql()
-    #     if "aggregation_author_frien" in sql:
-    #         sql = sql.replace("INSERT INTO", "INSERT INTO ... ON CONFLICT DO NOTHING")
-    #     cursor = self.connection.cursor()
-    #     cursor.execute(sql, params)
-    #     return cursor.rowcount
-
 class GaussDBSQLCompiler(BaseSQLCompiler):
     def __repr__(self):
         base = super().__repr__()
@@ -60,11 +50,8 @@ def compile(self, node, force_text=False):
         if node.__class__.__name__ == "OrderBy":
             node.expression.is_ordering = True
 
-        # if isinstance(node, JSONArray):
-        #     return self._compile_json_array(node)
-
-        # elif isinstance(node, JSONObject):
-        #     return self._compile_json_object(node)
+        if isinstance(node, JSONObject):
+            return self._compile_json_object(node)
 
         if node.__class__.__name__ == "KeyTransform":
             if getattr(node, "function", None) is None:
@@ -81,21 +68,6 @@ def compile(self, node, force_text=False):
 
         return super().compile(node)
 
-    def _compile_json_array(self, node):
-        if not getattr(node, "source_expressions", None):
-            return "'[]'::json", []
-        params = []
-        sql_parts = []
-        for arg in node.source_expressions:
-            arg_sql, arg_params = self.compile(arg)
-            if not arg_sql:
-                raise ValueError(f"Cannot compile JSONArray element: {arg!r}")
-            sql_parts.append(arg_sql)
-            params.extend(arg_params)
-
-        sql = f"json_build_array({', '.join(sql_parts)})"
-        return sql, params
-
     def _compile_json_object(self, node):
         expressions = getattr(node, "source_expressions", []) or []
         if not expressions:
@@ -154,14 +126,12 @@ def collect_path(n):
             return n, list(reversed(path))
 
         base_lhs, path = collect_path(node)
-
-        # if isinstance(base_lhs, JSONObject):
-        #     lhs_sql, lhs_params = self._compile_json_object(base_lhs)
-        #     current_type = "object"
-        # elif isinstance(base_lhs, JSONArray):
-        #     lhs_sql, lhs_params = self._compile_json_array(base_lhs)
-        #     current_type = "array"
-        if isinstance(base_lhs, Func):
+        if base_lhs is None:
+            raise ValueError(f"KeyTransform compile failed: base_lhs is None for node={node!r}")
+        if isinstance(base_lhs, JSONObject):
+            lhs_sql, lhs_params = self._compile_json_object(base_lhs)
+            current_type = "object"
+        elif isinstance(base_lhs, Func):
             return super().compile(node)
         else:
             lhs_sql, lhs_params = super().compile(base_lhs)
@@ -208,6 +178,8 @@ def collect_path(n):
                 if getattr(node, "_negated", False)
                 else f"({sql}) IS NULL"
             )
+        if not sql:
+            raise ValueError(f"_compile_key_transform returned empty SQL for node={node!r}")
         return sql, lhs_params
 
     def _compile_cast(self, node):
@@ -306,26 +278,3 @@ def _compile_has_any_keys(self, node):
         keys_sql = ", ".join(sql_parts)
         sql = f"{lhs_sql} ?| array[{keys_sql}]"
         return sql, params
-
-# class ManyToManyDescriptor(BaseManyToManyDescriptor):
-#     def _add_items(self, manager, *objs, **kwargs):
-#         print(f">>>ManyToManyDescriptor")
-#         db = kwargs.get("using") or manager._db or "default"
-#         for obj in objs:
-#             try:
-#                 manager.through._default_manager.using(db).get_or_create(
-#                     **{
-#                         manager.source_field_name: manager.instance,
-#                         manager.target_field_name: obj,
-#                     }
-#                 )
-#             except Exception:
-#                 pass
-
-# def execute_sql(self, sql, params=None, many=False, returning_fields=None):
-#     try:
-#         return super().execute_sql(sql, params, many, returning_fields)
-#     except utils.IntegrityError as e:
-#         if "already exists" in str(e):
-#             return
-#         raise