sqlobjects 1.0.2__tar.gz → 1.0.3__tar.gz

{sqlobjects-1.0.2/sqlobjects.egg-info → sqlobjects-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlobjects
-Version: 1.0.2
+Version: 1.0.3
 Summary: Django-style async ORM library based on SQLAlchemy with chainable queries, Q objects, and relationship loading
 Author-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
 Maintainer-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>

{sqlobjects-1.0.2 → sqlobjects-1.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlobjects"
-version = "1.0.2"
+version = "1.0.3"
 description = "Django-style async ORM library based on SQLAlchemy with chainable queries, Q objects, and relationship loading"
 readme = "README.md"
 license = { text = "MIT" }

{sqlobjects-1.0.2 → sqlobjects-1.0.3}/sqlobjects/mixins.py

@@ -392,19 +392,7 @@ class DataConversionMixin(DeferredLoadingMixin):
         all_fields = set(cls._get_field_names())
         filtered_data = {k: v for k, v in data.items() if k in all_fields}
 
-        table = cls.get_table()
-        for col in table.columns:  # noqa
-            if col.name not in filtered_data:
-                field_attr = getattr(cls, col.name, None)
-                if field_attr is not None and hasattr(field_attr, "get_default_factory"):
-                    factory = field_attr.get_default_factory()
-                    if factory and callable(factory):
-                        filtered_data[col.name] = factory()
-                        continue
-
-                if col.default is not None:
-                    if hasattr(col.default, "is_scalar") and col.default.is_scalar:
-                        filtered_data[col.name] = getattr(col.default, "arg", None)
+        # Default values will be handled by __init__ method
 
         init_data = {}
         non_init_data = {}
@@ -427,6 +415,11 @@ class DataConversionMixin(DeferredLoadingMixin):
         instance = cls(**init_data)  # noqa
 
         for field_name, value in non_init_data.items():
+            # Apply default value if value is None
+            if value is None:
+                default_value = instance._get_field_default_value(field_name)  # noqa # type: ignore[reportAttributeAccessIssue]
+                if default_value is not None:
+                    value = default_value
             setattr(instance, field_name, value)
 
         # Clear dirty fields since this is initial creation from dict

{sqlobjects-1.0.2 → sqlobjects-1.0.3}/sqlobjects/model.py

@@ -56,6 +56,9 @@ class ModelMixin(FieldCacheMixin, SignalMixin):
         if hasattr(self, "_history_initialized"):
             self._history_initialized = False
 
+        # Generate default values for fields not provided in kwargs
+        self._apply_default_values(kwargs)
+
         # Set field values
         for key, value in kwargs.items():
             setattr(self, key, value)
@@ -500,6 +503,46 @@ class ModelMixin(FieldCacheMixin, SignalMixin):
         relationships = getattr(self.__class__, "_relationships", {})
         return set(relationships.keys())
 
+    def _apply_default_values(self, kwargs: dict):
+        """Apply default values for fields not provided in kwargs.
+
+        Args:
+            kwargs: Dictionary of provided field values (will be modified)
+        """
+        for field_name in self._get_field_names():
+            if field_name not in kwargs or kwargs[field_name] is None:
+                default_value = self._get_field_default_value(field_name)
+                if default_value is not None:
+                    kwargs[field_name] = default_value
+
+    def _get_field_default_value(self, field_name: str):
+        """Get default value for a field.
+
+        Args:
+            field_name: Name of the field
+
+        Returns:
+            Default value or None if no default
+        """
+        field_attr = getattr(self.__class__, field_name, None)
+        if field_attr is None:
+            return None
+
+        # Priority: default_factory > SQLAlchemy default
+        if hasattr(field_attr, "get_default_factory"):
+            factory = field_attr.get_default_factory()
+            if factory and callable(factory):
+                return factory()
+
+        if hasattr(field_attr, "default") and field_attr.default is not None:
+            default_value = field_attr.default
+            if callable(default_value):
+                return default_value()
+            else:
+                return default_value
+
+        return None
+
 
 class ObjectModel(ModelMixin, metaclass=ModelProcessor):
     """Base model class with configuration support and common functionality.

{sqlobjects-1.0.2 → sqlobjects-1.0.3/sqlobjects.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlobjects
-Version: 1.0.2
+Version: 1.0.3
 Summary: Django-style async ORM library based on SQLAlchemy with chainable queries, Q objects, and relationship loading
 Author-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
 Maintainer-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>