postgresdb3 0.2.3__tar.gz → 0.3.1__tar.gz

{postgresdb3-0.2.3 → postgresdb3-0.3.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: postgresdb3
-Version: 0.2.3
+Version: 0.3.1
 Summary: Python uchun oddiy PostgreSQL wrapper
-Home-page: https://github.com/AlijonovUz/PostgresDB
 Author: Abdulbosit Alijonov
+Project-URL: Source Code, https://github.com/AlijonovUz/PostgresDB
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -15,7 +15,7 @@ Dynamic: author
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
-Dynamic: home-page
+Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -36,7 +36,7 @@ pip install postgresdb3
 
 ## Foydalanish (Sync)
 
-``` python
+```python
 from postgresdb3 import PostgresDB
 
 # Bazaga ulanish
@@ -44,16 +44,23 @@ db = PostgresDB(
     database="mydb",
     user="postgres",
     password="mypassword",
-    host="localhost", # ixtiyoriy
-    port=5432 # ixtiyoriy
+    host="localhost",  # ixtiyoriy
+    port=5432          # ixtiyoriy
 )
 
 # Jadval yaratish
 db.create("users", "id SERIAL PRIMARY KEY, name VARCHAR(100), age INT")
 
-# Ma'lumot qo'shish
+# Bitta qator qo'shish
 db.insert("users", "name, age", ("Ali", 25))
 
+# Bir nechta qator qo'shish
+db.insert_many(
+    "users",
+    "name, age",
+    [("Vali", 30), ("Gulnoza", 22), ("Hasan", 28)]
+)
+
 # Ma'lumotlarni olish
 users = db.select("users")
 print(users)
@@ -66,10 +73,14 @@ print(user)
 adults = db.select("users", where=("age > %s", [18]))
 print(adults)
 
-# Bir nechta shart
+# Bir nechta shart bilan
 specific_users = db.select("users", where=("age > %s AND name = %s", [18, "Ali"]))
 print(specific_users)
 
+# Faqat 2 ta qatorni olish
+users = db.select("users", fetchmany=2)
+print(users)
+
 # Jadvaldagi ma'lumotni yangilash
 db.update("users", "age", 26, "name", "Ali")
 
@@ -77,7 +88,14 @@ db.update("users", "age", 26, "name", "Ali")
 db.delete("users", "name", "Ali")
 
 # Jadvalni o'chirish
-db.drop("users")
+db.drop("users", cascade=False)
+
+# To‘g‘ridan-to‘g‘ri SQL bajarish (raw)
+result = db.raw("SELECT name, age FROM users WHERE age > %s", [25], fetchall=True)
+print(result)
+
+# Connectionni yopish
+db.close()
 ```
 
 ## Foydalanish (Async)
@@ -87,21 +105,26 @@ import asyncio
 from postgresdb3 import AsyncPostgresDB
 
 async def main():
-    # Bazaga ulanish
     db = AsyncPostgresDB(
         database="mydb",
         user="postgres",
         password="mypassword",
-        host="localhost", # ixtiyoriy
-        port=5432 # ixtiyoriy
+        host="localhost",
+        port=5432
     )
 
     # Jadval yaratish
     await db.create("users", "id SERIAL PRIMARY KEY, name VARCHAR(100), age INT")
 
-    # Ma'lumot qo'shish
+    # Bitta qator qo'shish
     await db.insert("users", "name, age", ["Ali", 25])
-    await db.insert("users", "name, age", ["Vali", 30])
+
+    # Bir nechta qator qo'shish
+    await db.insert_many(
+        "users",
+        "name, age",
+        [["Vali", 30], ["Gulnoza", 22], ["Hasan", 28]]
+    )
 
     # Barcha ma'lumotlarni olish
     users = await db.select("users")
@@ -115,10 +138,14 @@ async def main():
     adults = await db.select("users", where=("age > $1", [18]))
     print("Kattalar:", adults)
 
-    # Bir nechta shart
+    # Bir nechta shart bilan
     specific_users = await db.select("users", where=("age > $1 AND name = $2", [18, "Ali"]))
     print("Maxsus foydalanuvchi:", specific_users)
-
+    
+    # Faqat 2 ta qatorni olish
+    users = await db.select("users", fetchmany=2)
+    print(users)
+    
     # Jadvaldagi ma'lumotni yangilash
     await db.update("users", "age", 26, "name", "Ali")
 
@@ -126,12 +153,15 @@ async def main():
     await db.delete("users", "name", "Ali")
 
     # Jadvalni o'chirish
-    await db.drop("users")
+    await db.drop("users", cascade=False)
+
+    # To‘g‘ridan-to‘g‘ri SQL bajarish (raw)
+    result = await db.raw("SELECT name, age FROM users WHERE age > $1", [25], fetchall=True)
+    print("Raw query result:", result)
 
     # Connection poolni yopish
     await db.close_pool()
 
-# Asinxron loop ishga tushirish
 asyncio.run(main())
 ```
 
@@ -143,10 +173,12 @@ asyncio.run(main())
 **create(table, columns)** --- jadval yaratish, `columns` SQL
 sintaksisida.
 
-**drop(table)** --- jadvalni o'chirish.
+**drop(table, cascade=False)** --- jadvalni o'chirish.
 
 **insert(table, columns, values)** --- ma'lumot qo'shish.
 
+**insert_many(table, columns, values_list)** --- bir nechta qator qo‘shish
+
 **select(table, columns="\*", where=None, join=None, group_by=None,
 order_by=None, limit=None, fetchone=False)** --- ma'lumotlarni olish.
 
@@ -168,19 +200,16 @@ ma'lumotni yangilash.
 
 **delete(table, where_column, where_value)** --- ma'lumotni o'chirish.
 
-**manager(sql, params=None, commit=False, fetchall=False,
-fetchone=False)** --- barcha SQL amallarni bajaruvchi yagona metod.
-
 ## Qo‘shimcha
 
-`%s` bilan parametrizatsiya qilish xavfsiz va SQL injection'dan himoya qiladi.
+`%s`,`$1` bilan parametrizatsiya qilish xavfsiz va SQL injection'dan himoya qiladi.
 
-`where` va `join` `list` yoki `tuple` yordamida murakkab so‘rovlar yozish mumkin.
+`where` va `join` yordamida murakkab so‘rovlar yozish mumkin.
 
 `limit` va `order_by` parametrlaridan foydalanib ma'lumotlarni tartiblash va cheklash oson.
 
 `commit=True` bo‘lgan amallar darhol bazaga yoziladi, select() esa hech qachon o‘zgartirish kiritmaydi.
 
-`manager()` — barcha SQL buyruqlarini bajaruvchi yagona metod bo‘lib, kerak bo‘lganda to‘g‘ridan‑to‘g‘ri SQL yozish imkonini beradi.
+`raw()` — barcha SQL buyruqlarini bajaruvchi yagona metod bo‘lib, kerak bo‘lganda to‘g‘ridan‑to‘g‘ri SQL yozish imkonini beradi.
 
 PostgreSQL bilan ishlash uchun `psycopg2` kutubxonasi talab qilinadi.

{postgresdb3-0.2.3 → postgresdb3-0.3.1}/README.md

@@ -14,7 +14,7 @@ pip install postgresdb3
 
 ## Foydalanish (Sync)
 
-``` python
+```python
 from postgresdb3 import PostgresDB
 
 # Bazaga ulanish
@@ -22,16 +22,23 @@ db = PostgresDB(
     database="mydb",
     user="postgres",
     password="mypassword",
-    host="localhost", # ixtiyoriy
-    port=5432 # ixtiyoriy
+    host="localhost",  # ixtiyoriy
+    port=5432          # ixtiyoriy
 )
 
 # Jadval yaratish
 db.create("users", "id SERIAL PRIMARY KEY, name VARCHAR(100), age INT")
 
-# Ma'lumot qo'shish
+# Bitta qator qo'shish
 db.insert("users", "name, age", ("Ali", 25))
 
+# Bir nechta qator qo'shish
+db.insert_many(
+    "users",
+    "name, age",
+    [("Vali", 30), ("Gulnoza", 22), ("Hasan", 28)]
+)
+
 # Ma'lumotlarni olish
 users = db.select("users")
 print(users)
@@ -44,10 +51,14 @@ print(user)
 adults = db.select("users", where=("age > %s", [18]))
 print(adults)
 
-# Bir nechta shart
+# Bir nechta shart bilan
 specific_users = db.select("users", where=("age > %s AND name = %s", [18, "Ali"]))
 print(specific_users)
 
+# Faqat 2 ta qatorni olish
+users = db.select("users", fetchmany=2)
+print(users)
+
 # Jadvaldagi ma'lumotni yangilash
 db.update("users", "age", 26, "name", "Ali")
 
@@ -55,7 +66,14 @@ db.update("users", "age", 26, "name", "Ali")
 db.delete("users", "name", "Ali")
 
 # Jadvalni o'chirish
-db.drop("users")
+db.drop("users", cascade=False)
+
+# To‘g‘ridan-to‘g‘ri SQL bajarish (raw)
+result = db.raw("SELECT name, age FROM users WHERE age > %s", [25], fetchall=True)
+print(result)
+
+# Connectionni yopish
+db.close()
 ```
 
 ## Foydalanish (Async)
@@ -65,21 +83,26 @@ import asyncio
 from postgresdb3 import AsyncPostgresDB
 
 async def main():
-    # Bazaga ulanish
     db = AsyncPostgresDB(
         database="mydb",
         user="postgres",
         password="mypassword",
-        host="localhost", # ixtiyoriy
-        port=5432 # ixtiyoriy
+        host="localhost",
+        port=5432
     )
 
     # Jadval yaratish
     await db.create("users", "id SERIAL PRIMARY KEY, name VARCHAR(100), age INT")
 
-    # Ma'lumot qo'shish
+    # Bitta qator qo'shish
     await db.insert("users", "name, age", ["Ali", 25])
-    await db.insert("users", "name, age", ["Vali", 30])
+
+    # Bir nechta qator qo'shish
+    await db.insert_many(
+        "users",
+        "name, age",
+        [["Vali", 30], ["Gulnoza", 22], ["Hasan", 28]]
+    )
 
     # Barcha ma'lumotlarni olish
     users = await db.select("users")
@@ -93,10 +116,14 @@ async def main():
     adults = await db.select("users", where=("age > $1", [18]))
     print("Kattalar:", adults)
 
-    # Bir nechta shart
+    # Bir nechta shart bilan
     specific_users = await db.select("users", where=("age > $1 AND name = $2", [18, "Ali"]))
     print("Maxsus foydalanuvchi:", specific_users)
-
+    
+    # Faqat 2 ta qatorni olish
+    users = await db.select("users", fetchmany=2)
+    print(users)
+    
     # Jadvaldagi ma'lumotni yangilash
     await db.update("users", "age", 26, "name", "Ali")
 
@@ -104,12 +131,15 @@ async def main():
     await db.delete("users", "name", "Ali")
 
     # Jadvalni o'chirish
-    await db.drop("users")
+    await db.drop("users", cascade=False)
+
+    # To‘g‘ridan-to‘g‘ri SQL bajarish (raw)
+    result = await db.raw("SELECT name, age FROM users WHERE age > $1", [25], fetchall=True)
+    print("Raw query result:", result)
 
     # Connection poolni yopish
     await db.close_pool()
 
-# Asinxron loop ishga tushirish
 asyncio.run(main())
 ```
 
@@ -121,10 +151,12 @@ asyncio.run(main())
 **create(table, columns)** --- jadval yaratish, `columns` SQL
 sintaksisida.
 
-**drop(table)** --- jadvalni o'chirish.
+**drop(table, cascade=False)** --- jadvalni o'chirish.
 
 **insert(table, columns, values)** --- ma'lumot qo'shish.
 
+**insert_many(table, columns, values_list)** --- bir nechta qator qo‘shish
+
 **select(table, columns="\*", where=None, join=None, group_by=None,
 order_by=None, limit=None, fetchone=False)** --- ma'lumotlarni olish.
 
@@ -146,19 +178,16 @@ ma'lumotni yangilash.
 
 **delete(table, where_column, where_value)** --- ma'lumotni o'chirish.
 
-**manager(sql, params=None, commit=False, fetchall=False,
-fetchone=False)** --- barcha SQL amallarni bajaruvchi yagona metod.
-
 ## Qo‘shimcha
 
-`%s` bilan parametrizatsiya qilish xavfsiz va SQL injection'dan himoya qiladi.
+`%s`,`$1` bilan parametrizatsiya qilish xavfsiz va SQL injection'dan himoya qiladi.
 
-`where` va `join` `list` yoki `tuple` yordamida murakkab so‘rovlar yozish mumkin.
+`where` va `join` yordamida murakkab so‘rovlar yozish mumkin.
 
 `limit` va `order_by` parametrlaridan foydalanib ma'lumotlarni tartiblash va cheklash oson.
 
 `commit=True` bo‘lgan amallar darhol bazaga yoziladi, select() esa hech qachon o‘zgartirish kiritmaydi.
 
-`manager()` — barcha SQL buyruqlarini bajaruvchi yagona metod bo‘lib, kerak bo‘lganda to‘g‘ridan‑to‘g‘ri SQL yozish imkonini beradi.
+`raw()` — barcha SQL buyruqlarini bajaruvchi yagona metod bo‘lib, kerak bo‘lganda to‘g‘ridan‑to‘g‘ri SQL yozish imkonini beradi.
 
 PostgreSQL bilan ishlash uchun `psycopg2` kutubxonasi talab qilinadi.

{postgresdb3-0.2.3 → postgresdb3-0.3.1}/postgresdb3/async_db.py

@@ -11,7 +11,7 @@ class AsyncPostgresDB:
     Aiogram kabi async frameworklar bilan to‘g‘ridan-to‘g‘ri ishlash uchun mos.
     """
 
-    def __init__(self, database: str, user: str, password: str, host: str = "localhost", port: int = 5432):
+    def __init__(self, database: str, user: str, password: str, host: str = "localhost", port: int = 5432) -> None:
         """
         PostgreSQL bazasiga ulanishni tayyorlaydi.
 
@@ -29,7 +29,7 @@ class AsyncPostgresDB:
         self.port = port
         self.pool: Optional[asyncpg.pool.Pool] = None
 
-    async def manager(self, sql: str, *params, fetchone=False, fetchall=False, commit=False):
+    async def _manager(self, sql: str, *params, fetchone=False, fetchall=False, commit=False) -> Any:
         """
         Markaziy metod: barcha SQL so‘rovlarni bajaradi.
 
@@ -63,7 +63,7 @@ class AsyncPostgresDB:
             if fetchall:
                 return await conn.fetch(sql, *params)
 
-    async def close_pool(self):
+    async def close_pool(self) -> None:
         """
         Connection poolni yopadi.
         """
@@ -71,7 +71,7 @@ class AsyncPostgresDB:
             await self.pool.close()
             self.pool = None
 
-    async def create(self, table: str, columns: str):
+    async def create(self, table: str, columns: str) -> None:
         """
         Jadval yaratadi (agar mavjud bo‘lsa o‘tkazib yuboradi).
 
@@ -79,26 +79,34 @@ class AsyncPostgresDB:
             table (str): Jadval nomi.
             columns (str): Ustunlar va turlari, misol: "id SERIAL PRIMARY KEY, name TEXT".
         """
-        await self.manager(f"CREATE TABLE IF NOT EXISTS {table} ({columns})", commit=True)
+        await self._manager(f"CREATE TABLE IF NOT EXISTS {table} ({columns})", commit=True)
 
-    async def drop(self, table: str):
+    async def drop(self, table: str, cascade: bool = False) -> None:
         """
         Jadvalni o‘chiradi (agar mavjud bo‘lsa).
 
         Args:
             table (str): Jadval nomi.
+            cascade (bool): Agar True bo‘lsa, jadval bilan bog‘liq barcha obyektlar ham o‘chiradi. Default: True
         """
-        await self.manager(f"DROP TABLE IF EXISTS {table} CASCADE", commit=True)
+        sql = f"DROP TABLE IF EXISTS {table}"
+        if cascade:
+            sql += " CASCADE"
+
+        await self._manager(sql, commit=True)
 
     async def select(
-        self, table: str, columns: str = "*",
-        where: Optional[List[Any]] = None,
-        join: Optional[List[tuple]] = None,
-        group_by: Optional[str] = None,
-        order_by: Optional[str] = None,
-        limit: Optional[int] = None,
-        fetchone: bool = False
-    ):
+            self,
+            table: str,
+            columns: str = "*",
+            where: Optional[List[Any]] = None,
+            join: Optional[List[tuple]] = None,
+            group_by: Optional[str] = None,
+            order_by: Optional[str] = None,
+            limit: Optional[int] = None,
+            offset: Optional[int] = None,
+            fetchone: bool = False
+    ) -> Any:
         """
         Jadvaldan ma'lumotlarni tanlash.
 
@@ -110,6 +118,7 @@ class AsyncPostgresDB:
             group_by (Optional[str]): GROUP BY ustuni.
             order_by (Optional[str]): ORDER BY qoidasi.
             limit (Optional[int]): LIMIT qiymati.
+            offset (Optional[int]): OFFSET qiymati.
             fetchone (bool): True bo‘lsa faqat bitta qator qaytaradi.
 
         Returns:
@@ -137,9 +146,13 @@ class AsyncPostgresDB:
             sql += f" LIMIT $%d" % (len(params) + 1)
             params.append(limit)
 
-        return await self.manager(sql, *params, fetchone=fetchone, fetchall=not fetchone)
+        if offset is not None:
+            sql += " OFFSET $%d" % (len(params) + 1)
+            params.append(offset)
+
+        return await self._manager(sql, params, fetchone=fetchone, fetchall=not fetchone)
 
-    async def insert(self, table: str, columns: str, values: List[Any]):
+    async def insert(self, table: str, columns: str, values: List[Any]) -> None:
         """
         Jadvalga yangi qator qo‘shadi.
 
@@ -148,11 +161,52 @@ class AsyncPostgresDB:
             columns (str): Ustunlar nomi, misol: "name, age".
             values (List[Any]): Qiymatlar, misol: ["Ali", 25].
         """
-        placeholders = ", ".join(f"${i+1}" for i in range(len(values)))
+        placeholders = ", ".join(f"${i + 1}" for i in range(len(values)))
         sql = f"INSERT INTO {table} ({columns}) VALUES ({placeholders})"
-        await self.manager(sql, *values, commit=True)
+        await self._manager(sql, *values, commit=True)
+
+    async def insert_many(self, table: str, columns: str, values_list: List[List[Any]]) -> None:
+        """
+        Jadvalga bir nechta qator qo‘shish (bulk insert).
+
+        Args:
+            table (str): Jadval nomi.
+            columns (str): Ustunlar nomi, misol: "name, age".
+            values_list (List[List[Any]]): Qiymatlar ro‘yxati, misol: [["Ali", 25], ["Vali", 30]].
+
+        Raises:
+            ValueError: Agar `values_list` bo‘sh bo‘lsa.
+
+        Notes:
+            - `asyncpg` kutubxonasida har bir parametr uchun unikal `$n` indekslari kerak,
+              shuning uchun har bir qator uchun ketma-ket `$1, $2, ...` ishlatiladi.
+            - Metod barcha qatorlarni bir so‘rovda qo‘shadi.
+            - `fetchmany` kerak emas, chunki bu insert operatsiyasi natija qaytarmaydi.
+
+        Example:
+            await db.insert_many(
+                "users",
+                "name, age",
+                [["Ali", 25], ["Vali", 30], ["Guli", 22]]
+            )
+        """
+        if not values_list:
+            raise ValueError("values_list bo'sh bo'lishi mumkin emas")
+
+        placeholders_list = []
+        flat_values = []
+        counter = 1
+
+        for values in values_list:
+            placeholders = ", ".join(f"${i}" for i in range(counter, counter + len(values)))
+            placeholders_list.append(f"({placeholders})")
+            flat_values.extend(values)
+            counter += len(values)
 
-    async def update(self, table: str, set_column: str, set_value: Any, where_column: str, where_value: Any):
+        sql = f"INSERT INTO {table} ({columns}) VALUES {', '.join(placeholders_list)}"
+        await self._manager(sql, *flat_values, commit=True)
+
+    async def update(self, table: str, set_column: str, set_value: Any, where_column: str, where_value: Any) -> None:
         """
         Jadvaldagi qatorni yangilaydi.
 
@@ -164,9 +218,9 @@ class AsyncPostgresDB:
             where_value (Any): Filtrlash qiymati.
         """
         sql = f"UPDATE {table} SET {set_column} = $1 WHERE {where_column} = $2"
-        await self.manager(sql, set_value, where_value, commit=True)
+        await self._manager(sql, set_value, where_value, commit=True)
 
-    async def delete(self, table: str, where_column: str, where_value: Any):
+    async def delete(self, table: str, where_column: str, where_value: Any) -> None:
         """
         Jadvaldan qator o‘chiradi.
 
@@ -176,7 +230,7 @@ class AsyncPostgresDB:
             where_value (Any): Filtrlash qiymati.
         """
         sql = f"DELETE FROM {table} WHERE {where_column} = $1"
-        await self.manager(sql, where_value, commit=True)
+        await self._manager(sql, where_value, commit=True)
 
     async def list_tables(self, schema: str = "public") -> List[str]:
         """
@@ -189,15 +243,15 @@ class AsyncPostgresDB:
             List[str]: Jadval nomlari
         """
         sql = """
-            SELECT table_name
-            FROM information_schema.tables
-            WHERE table_schema = $1
-            ORDER BY table_name
-        """
-        result = await self.manager(sql, schema, fetchall=True)
+              SELECT table_name
+              FROM information_schema.tables
+              WHERE table_schema = $1
+              ORDER BY table_name;
+              """
+        result = await self._manager(sql, schema, fetchall=True)
         return [r["table_name"] for r in result]
 
-    async def describe_table(self, table: str, schema: str = "public"):
+    async def describe_table(self, table: str, schema: str = "public") -> List[str]:
         """
         Jadval ustunlari haqida ma'lumot beradi.
 
@@ -209,14 +263,15 @@ class AsyncPostgresDB:
             list[asyncpg.Record]: Har bir ustun bo‘yicha ma’lumot
         """
         sql = """
-            SELECT column_name, data_type, is_nullable, column_default
-            FROM information_schema.columns
-            WHERE table_schema = $1 AND table_name = $2
-            ORDER BY ordinal_position
-        """
-        return await self.manager(sql, schema, table, fetchall=True)
-
-    async def alter(self, table: str, action: str):
+              SELECT column_name, data_type, is_nullable, column_default
+              FROM information_schema.columns
+              WHERE table_schema = $1
+                AND table_name = $2
+              ORDER BY ordinal_position; \
+              """
+        return await self._manager(sql, schema, table, fetchall=True)
+
+    async def alter(self, table: str, action: str) -> None:
         """
         Jadval strukturasi o‘zgartirish (ALTER TABLE).
 
@@ -225,4 +280,4 @@ class AsyncPostgresDB:
             action (str): ALTER TABLE dan keyingi SQL qismi, misol: "ADD COLUMN age INT".
         """
         sql = f"ALTER TABLE {table} {action}"
-        await self.manager(sql, commit=True)
+        await self._manager(sql, commit=True)