sqlobjects 1.2.1__py3-none-any.whl → 1.2.2__py3-none-any.whl

sqlobjects/metadata.py

@@ -938,13 +938,25 @@ class ModelProcessor(type):
             cls: Model class
             table: SQLAlchemy Table instance
         """
-        for name, field_def in mcs._get_fields(cls).items():
-            if is_field_definition(field_def) and not getattr(field_def, "_is_relationship", False):
-                column_attr = get_column_from_field(field_def)
-                if column_attr is not None and hasattr(column_attr, "__column__"):
-                    # Update the ColumnAttribute's internal column to reference the table column
-                    if name in table.columns:
+        for name in table.columns.keys():
+            for klass in cls.__mro__:
+                descriptor = klass.__dict__.get(name)
+                if descriptor is not None and hasattr(descriptor, "_column_attribute"):
+                    column_attr = descriptor._column_attribute
+                    if column_attr is None or not hasattr(column_attr, "__column__"):
+                        break
+                    if klass is cls:
                         column_attr.__column__ = table.columns[name]  # type: ignore[reportAttributeAccessIssue]
+                    else:
+                        new_col_attr = object.__new__(type(column_attr))
+                        new_col_attr.__dict__.update(column_attr.__dict__)
+                        new_col_attr.__column__ = table.columns[name]
+                        new_col_attr.model_class = cls
+                        new_descriptor = object.__new__(type(descriptor))
+                        new_descriptor.__dict__.update(descriptor.__dict__)
+                        new_descriptor._column_attribute = new_col_attr
+                        type.__setattr__(cls, name, new_descriptor)
+                    break
 
     @classmethod
     def _initialize_field_cache(mcs, cls: Any) -> None:

{sqlobjects-1.2.1.dist-info → sqlobjects-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlobjects
-Version: 1.2.1
+Version: 1.2.2
 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.2.1.dist-info → sqlobjects-1.2.2.dist-info}/RECORD

@@ -2,7 +2,7 @@ sqlobjects/__init__.py,sha256=AiZiXBEjvrSItmhnlgyvMDCipU49XmvQPAujg-EoEDg,977
 sqlobjects/_install_rules.py,sha256=ndw9815-60WY_ORGUefijUBnoUHPd0NBzUkCL8mQLKc,4053
 sqlobjects/cascade.py,sha256=HLHB4TEoqK7m2i4X9JM0oX3nbltuTntaX3tMX1B1ym4,38389
 sqlobjects/exceptions.py,sha256=zV0pZp_SqZiLILTPHSBebecyOw1SsuqscS3AWdVcNbM,15938
-sqlobjects/metadata.py,sha256=7coGMRrvZtfVsZn8KioPAS66DBUBLhkKIYfD1BvaFFw,45321
+sqlobjects/metadata.py,sha256=aKk0r9s_ZCu2SmfB983lHQLOADDd-T9i2dPKKqHETm0,45923
 sqlobjects/mixins.py,sha256=TBZFYAfa9RKF0UpxloBwREoWRPrWFHQE8MjOu7Aepu0,25501
 sqlobjects/model.py,sha256=PwP-0XhlVktICRCEye0gYlXrkVQG13yErjOwwf2ssJ0,19273
 sqlobjects/queryset.py,sha256=KSr7X3NSP-HT29uFezId0qbto-tfOK7gqQ81qIQbOlw,49942
@@ -54,17 +54,17 @@ sqlobjects/utils/__init__.py,sha256=NsJ52Fl_PaB-2WlOIJVGNPmgOnqPmvYRmp7uaq5zfYs,
 sqlobjects/utils/inspect.py,sha256=u-Q9VBoSGYCE_3Soy8jMuCAdM-P7IkSzTxqrJop_Ilk,2612
 sqlobjects/utils/naming.py,sha256=PmfNuEz-Twly2qREjKfMNulJt8TmOUJaxzFTuts3COg,1411
 sqlobjects/utils/pattern.py,sha256=FGCgobTpnmKjdAtQidHIg4Xa2CQLeP35F0VuX_1T1dk,14740
-sqlobjects-1.2.1.data/data/share/sqlobjects/rules/01-database-session-guide.md,sha256=lnqRpcDhYKdH-f0avW1jXcWt3qi7XBwkMt7clTs9Zvg,7601
-sqlobjects-1.2.1.data/data/share/sqlobjects/rules/02-model-definition-guide.md,sha256=i5gNJM-0bIJ2xSUu3mij8uB9kJC9EAc_439sCBqRph8,10977
-sqlobjects-1.2.1.data/data/share/sqlobjects/rules/03-query-operations-guide.md,sha256=BEZE_WUUhY6sEZDiDtrbInlV_UVIhbYETABJTNhu2JQ,10550
-sqlobjects-1.2.1.data/data/share/sqlobjects/rules/04-crud-operations-guide.md,sha256=abUEvRPSiSjX8enclXO5Uryox9Rt0WFeRcFkvHXfPf8,10085
-sqlobjects-1.2.1.data/data/share/sqlobjects/rules/05-relationships-guide.md,sha256=MJ23fYOTWqrLd54ENZLu3S3QRqbLf7joq-YhF6-V8OQ,12204
-sqlobjects-1.2.1.data/data/share/sqlobjects/rules/06-validation-signals-guide.md,sha256=i9WLLhyCDoWGkIYqH2D_XLn98oMbF1pB3-L-b5gRbT4,14294
-sqlobjects-1.2.1.data/data/share/sqlobjects/rules/07-performance-guide.md,sha256=rjR0DjT39poEBVaUxAzJBEaMaBrZKLVer1zXaNNYfxg,12851
-sqlobjects-1.2.1.data/data/share/sqlobjects/rules/README.md,sha256=d2n5ZZT8LGvjL60u_HlzXn2uA8FwoCgqG3fuAhvMFvM,2280
-sqlobjects-1.2.1.dist-info/licenses/LICENSE,sha256=ScFR7nvWIhar0d32Y-LA4vqp9zNmy1HSJia7UX7jU6c,1068
-sqlobjects-1.2.1.dist-info/METADATA,sha256=S-kmcZYeRfKaJGKph1LLOuzeZ7GarkoZebohwI9rnAw,13740
-sqlobjects-1.2.1.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-sqlobjects-1.2.1.dist-info/entry_points.txt,sha256=9Q3Ci55MawxkQhMlR_eLJui00_rYYIVO_Aq_Dm0u5MQ,76
-sqlobjects-1.2.1.dist-info/top_level.txt,sha256=brO5vDtCpn4L9dpX0EHpehbu4kcHaK_2Bbnwze35YKc,11
-sqlobjects-1.2.1.dist-info/RECORD,,
+sqlobjects-1.2.2.data/data/share/sqlobjects/rules/01-database-session-guide.md,sha256=lnqRpcDhYKdH-f0avW1jXcWt3qi7XBwkMt7clTs9Zvg,7601
+sqlobjects-1.2.2.data/data/share/sqlobjects/rules/02-model-definition-guide.md,sha256=i5gNJM-0bIJ2xSUu3mij8uB9kJC9EAc_439sCBqRph8,10977
+sqlobjects-1.2.2.data/data/share/sqlobjects/rules/03-query-operations-guide.md,sha256=BEZE_WUUhY6sEZDiDtrbInlV_UVIhbYETABJTNhu2JQ,10550
+sqlobjects-1.2.2.data/data/share/sqlobjects/rules/04-crud-operations-guide.md,sha256=abUEvRPSiSjX8enclXO5Uryox9Rt0WFeRcFkvHXfPf8,10085
+sqlobjects-1.2.2.data/data/share/sqlobjects/rules/05-relationships-guide.md,sha256=MJ23fYOTWqrLd54ENZLu3S3QRqbLf7joq-YhF6-V8OQ,12204
+sqlobjects-1.2.2.data/data/share/sqlobjects/rules/06-validation-signals-guide.md,sha256=i9WLLhyCDoWGkIYqH2D_XLn98oMbF1pB3-L-b5gRbT4,14294
+sqlobjects-1.2.2.data/data/share/sqlobjects/rules/07-performance-guide.md,sha256=rjR0DjT39poEBVaUxAzJBEaMaBrZKLVer1zXaNNYfxg,12851
+sqlobjects-1.2.2.data/data/share/sqlobjects/rules/README.md,sha256=d2n5ZZT8LGvjL60u_HlzXn2uA8FwoCgqG3fuAhvMFvM,2280
+sqlobjects-1.2.2.dist-info/licenses/LICENSE,sha256=ScFR7nvWIhar0d32Y-LA4vqp9zNmy1HSJia7UX7jU6c,1068
+sqlobjects-1.2.2.dist-info/METADATA,sha256=JAP9CklPXcLpofaoeGWkSG_39s0d4EYYOGyVOVipk2M,13740
+sqlobjects-1.2.2.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+sqlobjects-1.2.2.dist-info/entry_points.txt,sha256=9Q3Ci55MawxkQhMlR_eLJui00_rYYIVO_Aq_Dm0u5MQ,76
+sqlobjects-1.2.2.dist-info/top_level.txt,sha256=brO5vDtCpn4L9dpX0EHpehbu4kcHaK_2Bbnwze35YKc,11
+sqlobjects-1.2.2.dist-info/RECORD,,