postgresdb3 1.0.4__tar.gz → 1.1.0__tar.gz

{postgresdb3-1.0.4 → postgresdb3-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresdb3
-Version: 1.0.4
+Version: 1.1.0
 Summary: High-Performance Sync and Async PostgreSQL ORM for Python
 Author: Abdulbosit Alijonov
 Project-URL: Source Code, https://github.com/AlijonovUz/PostgresDB
@@ -132,7 +132,7 @@ users = User.raw_sql("SELECT * FROM users WHERE age > %s", 20)
 print(users[0].name) # Bu Model Obyekti!
 
 # Asinxron
-users = await AsyncUser.raw_sql("SELECT * FROM asyncusers WHERE age > $1", 20)
+users = await AsyncUser.raw_sql("SELECT * FROM asyncusers WHERE age > %s", 20)
 ```
 
 ---
@@ -244,15 +244,16 @@ for u in users:
     u.age += 1
 User.bulk_update(users, fields=["age"])
 ```
+*(Eslatma: Ommaviy amallar to'liq atomar tranzaksiyaga o'ralgan, xatolik chiqsa 100% orqaga qaytadi!)*
 
 **Sahifalash (Pagination):**
 Foydalanuvchiga ma'lumotlarni qismlab (limit/offset bilan avtomatik) taqdim etish:
 ```python
 result = User.query().paginate(page=1, per_page=20)
-print(result["total"])        # Jami elementlar soni
-print(result["pages"])        # Jami sahifalar soni
-print(result["has_next"])     # Keyingi sahifa bormi? (True/False)
-print(result["data"])         # Modellar ro'yxati (20 ta)
+print(result.total)        # Jami elementlar soni
+print(result.pages)        # Jami sahifalar soni
+print(result.has_next)     # Keyingi sahifa bormi? (True/False)
+print(result.data)         # Modellar ro'yxati (20 ta)
 ```
 
 ---

{postgresdb3-1.0.4 → postgresdb3-1.1.0}/README.md

@@ -110,7 +110,7 @@ users = User.raw_sql("SELECT * FROM users WHERE age > %s", 20)
 print(users[0].name) # Bu Model Obyekti!
 
 # Asinxron
-users = await AsyncUser.raw_sql("SELECT * FROM asyncusers WHERE age > $1", 20)
+users = await AsyncUser.raw_sql("SELECT * FROM asyncusers WHERE age > %s", 20)
 ```
 
 ---
@@ -222,15 +222,16 @@ for u in users:
     u.age += 1
 User.bulk_update(users, fields=["age"])
 ```
+*(Eslatma: Ommaviy amallar to'liq atomar tranzaksiyaga o'ralgan, xatolik chiqsa 100% orqaga qaytadi!)*
 
 **Sahifalash (Pagination):**
 Foydalanuvchiga ma'lumotlarni qismlab (limit/offset bilan avtomatik) taqdim etish:
 ```python
 result = User.query().paginate(page=1, per_page=20)
-print(result["total"])        # Jami elementlar soni
-print(result["pages"])        # Jami sahifalar soni
-print(result["has_next"])     # Keyingi sahifa bormi? (True/False)
-print(result["data"])         # Modellar ro'yxati (20 ta)
+print(result.total)        # Jami elementlar soni
+print(result.pages)        # Jami sahifalar soni
+print(result.has_next)     # Keyingi sahifa bormi? (True/False)
+print(result.data)         # Modellar ro'yxati (20 ta)
 ```
 
 ---

{postgresdb3-1.0.4 → postgresdb3-1.1.0}/postgresdb3/core/async_db.py

@@ -27,6 +27,10 @@ class AsyncPostgresDB:
         self._async_conn = contextvars.ContextVar(f"async_conn_{id(self)}", default=None)
 
     async def _manager(self, sql: str, *params, fetchone=False, fetchall=False, commit=False, many=False) -> Any:
+        if "%s" in sql:
+            parts = sql.split("%s")
+            sql = "".join([part + f"${i+1}" for i, part in enumerate(parts[:-1])]) + parts[-1]
+            
         if self.echo:
             print(f"\033[94m[SQL]: {sql} \n[PARAMS]: {params}\033[0m")
         if not self.pool:

{postgresdb3-1.0.4 → postgresdb3-1.1.0}/postgresdb3/orm/models.py

@@ -131,7 +131,8 @@ class Model(BaseModel, metaclass=ModelMeta):
             values_list.append(val_tuple)
             
         columns_str = ", ".join(columns)
-        cls.db.insert_many(cls.table, columns_str, values_list)
+        with cls.db.transaction():
+            cls.db.insert_many(cls.table, columns_str, values_list)
 
     @classmethod
     def bulk_update(cls, instances: list["Model"], fields: list[str]) -> None:
@@ -147,7 +148,8 @@ class Model(BaseModel, metaclass=ModelMeta):
             val_tuple = tuple(getattr(inst, f, None) for f in fields) + (getattr(inst, pk_name),)
             values_list.append(val_tuple)
             
-        cls.db._manager(sql, values_list, commit=True, many=True)
+        with cls.db.transaction():
+            cls.db._manager(sql, values_list, commit=True, many=True)
 
     def save(self):
         self.__class__._check_setup()
@@ -345,7 +347,8 @@ class AsyncModel(BaseModel, metaclass=ModelMeta):
             values_list.append(val_tuple)
             
         columns_str = ", ".join(columns)
-        await cls.db.insert_many(cls.table, columns_str, values_list)
+        async with cls.db.transaction():
+            await cls.db.insert_many(cls.table, columns_str, values_list)
 
     @classmethod
     async def bulk_update(cls, instances: list["AsyncModel"], fields: list[str]) -> None:
@@ -361,7 +364,8 @@ class AsyncModel(BaseModel, metaclass=ModelMeta):
             val_tuple = tuple(getattr(inst, f, None) for f in fields) + (getattr(inst, pk_name),)
             values_list.append(val_tuple)
             
-        await cls.db._manager(sql, values_list, commit=True, many=True)
+        async with cls.db.transaction():
+            await cls.db._manager(sql, values_list, commit=True, many=True)
 
     async def save(self):
         self.__class__._check_setup()

{postgresdb3-1.0.4 → postgresdb3-1.1.0}/postgresdb3/orm/query.py

@@ -1,3 +1,18 @@
+from dataclasses import dataclass
+from typing import TypeVar, Generic
+
+T = TypeVar('T')
+
+@dataclass
+class PaginationResult(Generic[T]):
+    total: int
+    pages: int
+    current_page: int
+    per_page: int
+    has_next: bool
+    has_prev: bool
+    data: list[T]
+
 class QuerySet:
     def __init__(self, model):
         self.model = model
@@ -313,15 +328,15 @@ class QuerySet:
         total = self.count()
         pages = (total + per_page - 1) // per_page
         data = self.limit(per_page).offset((page - 1) * per_page).all()
-        return {
-            "total": total,
-            "pages": pages,
-            "current_page": page,
-            "per_page": per_page,
-            "has_next": page < pages,
-            "has_prev": page > 1,
-            "data": data
-        }
+        return PaginationResult(
+            total=total,
+            pages=pages,
+            current_page=page,
+            per_page=per_page,
+            has_next=page < pages,
+            has_prev=page > 1,
+            data=data
+        )
 
     def exists(self):
         where = self._build_where()
@@ -657,15 +672,15 @@ class AsyncQuerySet:
         total = await self.count()
         pages = (total + per_page - 1) // per_page
         data = await self.limit(per_page).offset((page - 1) * per_page).all()
-        return {
-            "total": total,
-            "pages": pages,
-            "current_page": page,
-            "per_page": per_page,
-            "has_next": page < pages,
-            "has_prev": page > 1,
-            "data": data
-        }
+        return PaginationResult(
+            total=total,
+            pages=pages,
+            current_page=page,
+            per_page=per_page,
+            has_next=page < pages,
+            has_prev=page > 1,
+            data=data
+        )
 
     async def exists(self):
         where = self._build_where()

{postgresdb3-1.0.4 → postgresdb3-1.1.0}/postgresdb3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresdb3
-Version: 1.0.4
+Version: 1.1.0
 Summary: High-Performance Sync and Async PostgreSQL ORM for Python
 Author: Abdulbosit Alijonov
 Project-URL: Source Code, https://github.com/AlijonovUz/PostgresDB
@@ -132,7 +132,7 @@ users = User.raw_sql("SELECT * FROM users WHERE age > %s", 20)
 print(users[0].name) # Bu Model Obyekti!
 
 # Asinxron
-users = await AsyncUser.raw_sql("SELECT * FROM asyncusers WHERE age > $1", 20)
+users = await AsyncUser.raw_sql("SELECT * FROM asyncusers WHERE age > %s", 20)
 ```
 
 ---
@@ -244,15 +244,16 @@ for u in users:
     u.age += 1
 User.bulk_update(users, fields=["age"])
 ```
+*(Eslatma: Ommaviy amallar to'liq atomar tranzaksiyaga o'ralgan, xatolik chiqsa 100% orqaga qaytadi!)*
 
 **Sahifalash (Pagination):**
 Foydalanuvchiga ma'lumotlarni qismlab (limit/offset bilan avtomatik) taqdim etish:
 ```python
 result = User.query().paginate(page=1, per_page=20)
-print(result["total"])        # Jami elementlar soni
-print(result["pages"])        # Jami sahifalar soni
-print(result["has_next"])     # Keyingi sahifa bormi? (True/False)
-print(result["data"])         # Modellar ro'yxati (20 ta)
+print(result.total)        # Jami elementlar soni
+print(result.pages)        # Jami sahifalar soni
+print(result.has_next)     # Keyingi sahifa bormi? (True/False)
+print(result.data)         # Modellar ro'yxati (20 ta)
 ```
 
 ---

{postgresdb3-1.0.4 → postgresdb3-1.1.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as f:
 
 setup(
     name="postgresdb3",
-    version="1.0.4",
+    version="1.1.0",
     packages=find_packages(),
     install_requires=[
         "psycopg2>=2.9",