orm-database 0.3.14__tar.gz → 0.3.16__tar.gz

{orm_database-0.3.14 → orm_database-0.3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: orm_database
-Version: 0.3.14
+Version: 0.3.16
 Summary: This module is written to launch your programs with any database you want in the shortest time 
 Home-page: https://github.com/sisrsis/orm-database
 Author: SISRSIS

{orm_database-0.3.14 → orm_database-0.3.16}/orm_database/orm_database.py

@@ -100,7 +100,6 @@ class PostgreSQL:
         try:
             query=query_baseModel_create_table(table,class_BaseModel)
             await self.db.execute(query)
-            await self.db.close()
             return True
         except:
             return False
@@ -108,20 +107,17 @@ class PostgreSQL:
     async def teble_create(self, table: str, field: dict):
         query=query_create_table(table,field)
         await self.db.execute(query)
-        await self.db.close()
 
 
     async def insert_value(self, table: str, value: dict):
         query = query_insert_value(table,value)
         await self.db.execute(query)
-        await self.db.close()
 
 
     async def insert_values(self, table: str, values: list):
         for value in values:
             query = query_insert_values(table=table,value=value)
             await self.db.execute(query)
-        await self.db.close()
 
     async def select_all(self, table: str, filed: list, all: bool = False):
         if all == True:
@@ -145,7 +141,6 @@ class PostgreSQL:
                 data[filed[conter]] = b
                 conter += 1
             data_row.append(dict(data))
-        await self.db.close()
         print(data_row)
         return data_row
 

{orm_database-0.3.14 → orm_database-0.3.16}/orm_database/orm_query.py

@@ -1,8 +1,10 @@
 def query_baseModel_create_table(table,class_BaseModel):
     query = f"CREATE TABLE {table} ("
     result=class_BaseModel.model_json_schema()
+    list_keys = result['properties']
+    list_keys = list(list_keys.keys())
     type=""
-    for a in result['required']:
+    for a in list_keys:
         data = result['properties'][a]
         if len(data.keys()) == 2:
             match data["type"]:
@@ -16,17 +18,21 @@ def query_baseModel_create_table(table,class_BaseModel):
                     type = "bool"
             query = query + a + " " + type + ","
         else :
-            match data["type"]:
-                case "string":
-                    type = f"varchar({data["varchar"]})"
-                case "number":
-                    type = "float"
-                case "integer":
-                    type = "int" 
-                case "boolean":
-                    type = "bool"
-            
-            query = query + a + " " + type + "," 
+            try:
+                type = data["default"]
+                query = query + a + " " + type + "," 
+            except:    
+                match data["type"]:
+                    case "string":
+                        type = f"varchar({data["varchar"]})"
+                    case "number":
+                        type = "float"
+                    case "integer":
+                        type = "int" 
+                    case "boolean":
+                        type = "bool"
+                
+                query = query + a + " " + type + "," 
     query = query[:-1]
     query = query + ")"
     return query

{orm_database-0.3.14 → orm_database-0.3.16}/orm_database.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: orm_database
-Version: 0.3.14
+Version: 0.3.16
 Summary: This module is written to launch your programs with any database you want in the shortest time 
 Home-page: https://github.com/sisrsis/orm-database
 Author: SISRSIS

{orm_database-0.3.14 → orm_database-0.3.16}/setup.py

@@ -6,7 +6,7 @@ long_description = (this_directory / "README.md").read_text()
 
 setup(
    name='orm_database',
-   version='0.3.14',
+   version='0.3.16',
    description='This module is written to launch your programs with any database you want in the shortest time ',
    license="MIT",
    author='SISRSIS',