dapper-sqls 1.2.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

dapper_sqls/builders/model/model.py

@@ -373,42 +373,46 @@ class ModelBuilder(object):
         return grouped_list
     
     def get_models_db(self, tables : dict[str, SqlTable]):
+        models : list[TableBaseModel] = []
+        for table in tables.values():
+            if not table.available:
+                continue
+            models.append(self.get_model_db(table))
+        return models
 
+    def get_model_db(self, table : SqlTable):
+            
         from datetime import datetime
         from pydantic import Field
         from typing import Union, Optional, ClassVar, Set
         from dapper_sqls import (TableBaseModel, StringQueryField, NumericQueryField, BoolQueryField, DateQueryField, BytesQueryField,
-                                JoinNumericCondition, JoinStringCondition, JoinBooleanCondition, JoinDateCondition, JoinBytesCondition)
-
-        models : list[TableBaseModel] = []
-        for table in tables.values():
-            if not table.available:
-                continue
+                            JoinNumericCondition, JoinStringCondition, JoinBooleanCondition, JoinDateCondition, JoinBytesCondition)
 
-            table_description = create_table_description(table)
+        
+        table_description = create_table_description(table)
 
-            table_name = table.TABLE_NAME
-            class_name = table_name 
-            schema = table.TABLE_SCHEMA
+        table_name = table.TABLE_NAME
+        class_name = table_name 
+        schema = table.TABLE_SCHEMA
 
-            fields = [create_field(row) for row in table.COLUMNS if row.available]
-            fields_str = "\n    ".join(fields)
+        fields = [create_field(row) for row in table.COLUMNS if row.available]
+        fields_str = "\n    ".join(fields)
 
-            identities = {d.COLUMN_NAME for d in table.COLUMNS if d.IS_IDENTITY == "YES" and d.available}
+        identities = {d.COLUMN_NAME for d in table.COLUMNS if d.IS_IDENTITY == "YES" and d.available}
 
-            primary_keys = {d.COLUMN_NAME for d in table.COLUMNS if d.IS_PRIMARY_KEY == "YES" and d.available}
+        primary_keys = {d.COLUMN_NAME for d in table.COLUMNS if d.IS_PRIMARY_KEY == "YES" and d.available}
 
-            optional_fields = {d.COLUMN_NAME for d in table.COLUMNS if d.IS_NULLABLE == "YES" and d.available}
+        optional_fields = {d.COLUMN_NAME for d in table.COLUMNS if d.IS_NULLABLE == "YES" and d.available}
 
-            max_length_fields = {
-                d.COLUMN_NAME: d.CHARACTER_MAXIMUM_LENGTH
-                for d in table.COLUMNS
-                if d.CHARACTER_MAXIMUM_LENGTH is not None and d.CHARACTER_MAXIMUM_LENGTH > 0 and d.available
-            }
+        max_length_fields = {
+            d.COLUMN_NAME: d.CHARACTER_MAXIMUM_LENGTH
+            for d in table.COLUMNS
+            if d.CHARACTER_MAXIMUM_LENGTH is not None and d.CHARACTER_MAXIMUM_LENGTH > 0 and d.available
+        }
 
-            table_alias = f'_alias_{table_name.lower()}_alias_'
+        table_alias = f'_alias_{table_name.lower()}_alias_'
 
-            content_model = f'''# coding: utf-8
+        content_model = f'''# coding: utf-8
 class {class_name}(TableBaseModel):
     TABLE_NAME: ClassVar[str] = '[{schema}].[{table_name}]'
 
@@ -426,31 +430,27 @@ class {class_name}(TableBaseModel):
     
     {fields_str}
             '''
-            local_vars = {}
-            exec(content_model, {
-                "TableBaseModel": TableBaseModel,
-                "StringQueryField": StringQueryField,
-                "NumericQueryField": NumericQueryField,
-                "BoolQueryField": BoolQueryField,
-                "DateQueryField": DateQueryField,
-                "BytesQueryField": BytesQueryField,
-                "JoinNumericCondition": JoinNumericCondition,
-                "JoinStringCondition": JoinStringCondition,
-                "JoinBooleanCondition": JoinBooleanCondition,
-                "JoinDateCondition": JoinDateCondition,
-                "JoinBytesCondition": JoinBytesCondition,
-                "datetime": datetime,
-                "Field": Field,
-                "Union": Union,
-                "Optional": Optional,
-                "ClassVar": ClassVar,
-                "Set": Set
-            }, local_vars)
-            model_class = local_vars[class_name]
-            models.append(model_class)
-
-        return models
-
+        local_vars = {}
+        exec(content_model, {
+            "TableBaseModel": TableBaseModel,
+            "StringQueryField": StringQueryField,
+            "NumericQueryField": NumericQueryField,
+            "BoolQueryField": BoolQueryField,
+            "DateQueryField": DateQueryField,
+            "BytesQueryField": BytesQueryField,
+            "JoinNumericCondition": JoinNumericCondition,
+            "JoinStringCondition": JoinStringCondition,
+            "JoinBooleanCondition": JoinBooleanCondition,
+            "JoinDateCondition": JoinDateCondition,
+            "JoinBytesCondition": JoinBytesCondition,
+            "datetime": datetime,
+            "Field": Field,
+            "Union": Union,
+            "Optional": Optional,
+            "ClassVar": ClassVar,
+            "Set": Set
+        }, local_vars)
+        return local_vars[class_name]
 
     def create_model_db(self, dir_path : str, create_orm = True, create_stp = True, *, table_catalog : str | list[str] | tuple[str] = "all",
                           table_schema : str | list[str] | tuple[str] = "all",

{dapper_sqls-1.2.0.dist-info → dapper_sqls-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dapper-sqls
-Version: 1.2.0
+Version: 1.2.1
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: Samuel Semedo

{dapper_sqls-1.2.0.dist-info → dapper_sqls-1.2.1.dist-info}/RECORD

@@ -11,7 +11,7 @@ dapper_sqls/builders/query.py,sha256=Qf2V4MSSrZsHsMoSjczrAga5gcRf6Vl-vhJxtcLGVBA
 dapper_sqls/builders/stored.py,sha256=EHNRTLFYDVvqqWkmQggzJIbXfTKZN4Se8rbME7wLPHU,3131
 dapper_sqls/builders/stp.py,sha256=LELylyG5tefcIk6kpsUTTuCkakRKTu93OwWCHB6mxU4,4915
 dapper_sqls/builders/model/__init__.py,sha256=9cAgoo-zu82YhtsmePseZhfeX94UMwfYuP9j-3d597Q,41
-dapper_sqls/builders/model/model.py,sha256=lj0QKcNT2XYGZ5MXGje4klsFuRbZpA8h1mQ0njZ5mr8,34749
+dapper_sqls/builders/model/model.py,sha256=OULDuudqkj5oh1NlYzDJZwbQVDXh735LXhyCWiqpvWM,34668
 dapper_sqls/builders/model/utils.py,sha256=w-EBGxwltFFIw4jGvuQAvyCAnoDysqaPhfk86JLvCTs,27583
 dapper_sqls/dapper/__init__.py,sha256=AlQJ-QYMqKeerSQBM8Dc9_VQwUKCN4bl4ThKHsTlYms,38
 dapper_sqls/dapper/dapper.py,sha256=3sFRtgw_M3zZI8dyDJacVFwzAuH7jbyQehfCiYMymZs,2584
@@ -34,7 +34,7 @@ dapper_sqls/sqlite/installer.py,sha256=nCDGRNUEvAEHx8Pw3izXx9miJJ3o5cjjPWA07nlqA
 dapper_sqls/sqlite/local_database.py,sha256=kuEVRJvzUUQg3X1Abq9ZYslO9n5IMovaCj7jnB51qSs,5902
 dapper_sqls/sqlite/models.py,sha256=m1I0-iYDdv-4fVYMsAboRYHbMEcwI4GScZSdbs7_nUY,2232
 dapper_sqls/sqlite/utils.py,sha256=22n2ry7_7b7XGDjwv3sY8swADpXDAynR0-E8WQrvHzc,230
-dapper_sqls-1.2.0.dist-info/METADATA,sha256=zR1hQdDMHsMayWXuNJuHFgnh9JeTwEtz0ScH2wrGMME,964
-dapper_sqls-1.2.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-dapper_sqls-1.2.0.dist-info/top_level.txt,sha256=Pe1YqCPngnYbSVdhJyDrdFWHFCOqBvFW8WK7kTaIax4,12
-dapper_sqls-1.2.0.dist-info/RECORD,,
+dapper_sqls-1.2.1.dist-info/METADATA,sha256=Lcvmw9RHD9l5YFo7Lag1BaqHIdKwduFjcHlUWefuqHk,964
+dapper_sqls-1.2.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+dapper_sqls-1.2.1.dist-info/top_level.txt,sha256=Pe1YqCPngnYbSVdhJyDrdFWHFCOqBvFW8WK7kTaIax4,12
+dapper_sqls-1.2.1.dist-info/RECORD,,