postgresdb3 0.3.5__tar.gz → 0.4.0__tar.gz

{postgresdb3-0.3.5 → postgresdb3-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresdb3
-Version: 0.3.5
+Version: 0.4.0
 Summary: Python uchun oddiy PostgreSQL wrapper
 Author: Abdulbosit Alijonov
 Project-URL: Source Code, https://github.com/AlijonovUz/PostgresDB
@@ -65,18 +65,62 @@ db.insert_many(
 users = db.select("users")
 print(users)
 
+# Faqat kerakli ustunlarni olish
+users = db.select("users", columns=["id", "name"])
+print(users)
+
 # Bitta qatorni olish
-user = db.select("users", where=("name=%s", ["Ali"]), fetchone=True)
+user = db.select("users", where={"name": "Ali"}, fetchone=True)
 print(user)
 
 # Shart bilan ma'lumot olish
-adults = db.select("users", where=("age > %s", [18]))
+adults = db.select("users", where={"age__gt": 18})
 print(adults)
 
 # Bir nechta shart bilan
-specific_users = db.select("users", where=("age > %s AND name = %s", [18, "Ali"]))
+specific_users = db.select(
+    "users",
+    where={
+        "age__gt": 18,
+        "name": "Ali"
+    }
+)
 print(specific_users)
 
+# LIKE bilan qidirish
+users_like = db.select("users", where={"name__like": "%Ali%"})
+print(users_like)
+
+# ILIKE bilan qidirish
+users_ilike = db.select("users", where={"name__ilike": "%ali%"})
+print(users_ilike)
+
+# IN bilan qidirish
+selected_users = db.select("users", where={"id__in": [1, 2, 3]})
+print(selected_users)
+
+# NULL bilan ishlash
+users_with_null = db.select("users", where={"name__isnull": False})
+print(users_with_null)
+
+# Tartiblash va limit
+ordered_users = db.select(
+    "users",
+    where={"age__gt": 18},
+    order_by="age DESC",
+    limit=2
+)
+print(ordered_users)
+
+# Pagination
+paged_users = db.select(
+    "users",
+    order_by="id ASC",
+    limit=2,
+    offset=2
+)
+print(paged_users)
+
 # Faqat 2 ta qatorni olish
 users = db.select("users", fetchmany=2)
 print(users)
@@ -130,18 +174,62 @@ async def main():
     users = await db.select("users")
     print("Barcha foydalanuvchilar:", users)
 
+    # Faqat kerakli ustunlarni olish
+    users = await db.select("users", columns=["id", "name"])
+    print("Faqat id va name:", users)
+
     # Bitta qatorni olish
-    user = await db.select("users", where=("name=$1", ["Ali"]), fetchone=True)
+    user = await db.select("users", where={"name": "Ali"}, fetchone=True)
     print("Foydalanuvchi Ali:", user)
 
     # Shart bilan ma'lumot olish
-    adults = await db.select("users", where=("age > $1", [18]))
+    adults = await db.select("users", where={"age__gt": 18})
     print("Kattalar:", adults)
 
     # Bir nechta shart bilan
-    specific_users = await db.select("users", where=("age > $1 AND name = $2", [18, "Ali"]))
+    specific_users = await db.select(
+        "users",
+        where={
+            "age__gt": 18,
+            "name": "Ali"
+        }
+    )
     print("Maxsus foydalanuvchi:", specific_users)
-    
+
+    # LIKE bilan qidirish
+    users_like = await db.select("users", where={"name__like": "%Ali%"})
+    print("LIKE bo'yicha qidiruv:", users_like)
+
+    # ILIKE bilan qidirish
+    users_ilike = await db.select("users", where={"name__ilike": "%ali%"})
+    print("ILIKE bo'yicha qidiruv:", users_ilike)
+
+    # IN bilan qidirish
+    selected_users = await db.select("users", where={"id__in": [1, 2, 3]})
+    print("Tanlangan foydalanuvchilar:", selected_users)
+
+    # NULL bilan ishlash
+    users_with_not_null_name = await db.select("users", where={"name__isnull": False})
+    print("Name NULL bo'lmaganlar:", users_with_not_null_name)
+
+    # Tartiblash va limit
+    ordered_users = await db.select(
+        "users",
+        where={"age__gt": 18},
+        order_by="age DESC",
+        limit=2
+    )
+    print("Tartiblangan foydalanuvchilar:", ordered_users)
+
+    # Pagination
+    paged_users = await db.select(
+        "users",
+        order_by="id ASC",
+        limit=2,
+        offset=1
+    )
+    print("Pagination natijasi:", paged_users)
+
     # Jadvaldagi ma'lumotni yangilash
     await db.update("users", "age", 26, "name", "Ali")
 

{postgresdb3-0.3.5 → postgresdb3-0.4.0}/README.md

@@ -43,18 +43,62 @@ db.insert_many(
 users = db.select("users")
 print(users)
 
+# Faqat kerakli ustunlarni olish
+users = db.select("users", columns=["id", "name"])
+print(users)
+
 # Bitta qatorni olish
-user = db.select("users", where=("name=%s", ["Ali"]), fetchone=True)
+user = db.select("users", where={"name": "Ali"}, fetchone=True)
 print(user)
 
 # Shart bilan ma'lumot olish
-adults = db.select("users", where=("age > %s", [18]))
+adults = db.select("users", where={"age__gt": 18})
 print(adults)
 
 # Bir nechta shart bilan
-specific_users = db.select("users", where=("age > %s AND name = %s", [18, "Ali"]))
+specific_users = db.select(
+    "users",
+    where={
+        "age__gt": 18,
+        "name": "Ali"
+    }
+)
 print(specific_users)
 
+# LIKE bilan qidirish
+users_like = db.select("users", where={"name__like": "%Ali%"})
+print(users_like)
+
+# ILIKE bilan qidirish
+users_ilike = db.select("users", where={"name__ilike": "%ali%"})
+print(users_ilike)
+
+# IN bilan qidirish
+selected_users = db.select("users", where={"id__in": [1, 2, 3]})
+print(selected_users)
+
+# NULL bilan ishlash
+users_with_null = db.select("users", where={"name__isnull": False})
+print(users_with_null)
+
+# Tartiblash va limit
+ordered_users = db.select(
+    "users",
+    where={"age__gt": 18},
+    order_by="age DESC",
+    limit=2
+)
+print(ordered_users)
+
+# Pagination
+paged_users = db.select(
+    "users",
+    order_by="id ASC",
+    limit=2,
+    offset=2
+)
+print(paged_users)
+
 # Faqat 2 ta qatorni olish
 users = db.select("users", fetchmany=2)
 print(users)
@@ -108,18 +152,62 @@ async def main():
     users = await db.select("users")
     print("Barcha foydalanuvchilar:", users)
 
+    # Faqat kerakli ustunlarni olish
+    users = await db.select("users", columns=["id", "name"])
+    print("Faqat id va name:", users)
+
     # Bitta qatorni olish
-    user = await db.select("users", where=("name=$1", ["Ali"]), fetchone=True)
+    user = await db.select("users", where={"name": "Ali"}, fetchone=True)
     print("Foydalanuvchi Ali:", user)
 
     # Shart bilan ma'lumot olish
-    adults = await db.select("users", where=("age > $1", [18]))
+    adults = await db.select("users", where={"age__gt": 18})
     print("Kattalar:", adults)
 
     # Bir nechta shart bilan
-    specific_users = await db.select("users", where=("age > $1 AND name = $2", [18, "Ali"]))
+    specific_users = await db.select(
+        "users",
+        where={
+            "age__gt": 18,
+            "name": "Ali"
+        }
+    )
     print("Maxsus foydalanuvchi:", specific_users)
-    
+
+    # LIKE bilan qidirish
+    users_like = await db.select("users", where={"name__like": "%Ali%"})
+    print("LIKE bo'yicha qidiruv:", users_like)
+
+    # ILIKE bilan qidirish
+    users_ilike = await db.select("users", where={"name__ilike": "%ali%"})
+    print("ILIKE bo'yicha qidiruv:", users_ilike)
+
+    # IN bilan qidirish
+    selected_users = await db.select("users", where={"id__in": [1, 2, 3]})
+    print("Tanlangan foydalanuvchilar:", selected_users)
+
+    # NULL bilan ishlash
+    users_with_not_null_name = await db.select("users", where={"name__isnull": False})
+    print("Name NULL bo'lmaganlar:", users_with_not_null_name)
+
+    # Tartiblash va limit
+    ordered_users = await db.select(
+        "users",
+        where={"age__gt": 18},
+        order_by="age DESC",
+        limit=2
+    )
+    print("Tartiblangan foydalanuvchilar:", ordered_users)
+
+    # Pagination
+    paged_users = await db.select(
+        "users",
+        order_by="id ASC",
+        limit=2,
+        offset=1
+    )
+    print("Pagination natijasi:", paged_users)
+
     # Jadvaldagi ma'lumotni yangilash
     await db.update("users", "age", 26, "name", "Ali")
 

{postgresdb3-0.3.5 → postgresdb3-0.4.0}/postgresdb3/async_db.py

@@ -95,11 +95,171 @@ class AsyncPostgresDB:
 
         await self._manager(sql, commit=True)
 
+    def _validate_identifier(self, value: str, name: str = "identifier") -> str:
+        """
+        Jadval yoki ustun nomi uchun minimal tekshiruv.
+        Faqat harf, raqam, underscore va nuqtaga ruxsat beradi.
+        """
+        if not isinstance(value, str) or not value.strip():
+            raise ValueError(f"{name} bo'sh bo'lmasligi kerak")
+
+        cleaned = value.replace("_", "").replace(".", "")
+        if not cleaned.isalnum():
+            raise ValueError(f"Invalid {name}: {value}")
+
+        return value
+
+    def _normalize_columns(self, columns: str | list[str]) -> str:
+        """
+        columns list bo'lsa stringga aylantiradi.
+        list bo'lsa har bir column validate qilinadi.
+        str bo'lsa SQL expression bo'lishi mumkinligi uchun o'z holicha qaytariladi.
+        """
+        if isinstance(columns, list):
+            if not columns:
+                raise ValueError("columns bo'sh list bo'lmasligi kerak")
+
+            validated_columns = [self._validate_identifier(col, "column") for col in columns]
+            return ", ".join(validated_columns)
+
+        if not isinstance(columns, str) or not columns.strip():
+            raise ValueError("columns noto'g'ri bo'lishi mumkin emas")
+
+        return columns
+
+    def _build_where(self, where: Any, start_index: int = 1) -> tuple[str, list]:
+        """
+        Qo'llab-quvvatlanadi:
+
+        1) tuple:
+           ("age > $1", [18])
+
+        2) dict:
+           {
+               "age__gt": 18,
+               "name__ilike": "%ali%",
+               "status": "active",
+               "id__in": [1, 2, 3],
+               "deleted_at__isnull": True
+           }
+
+        3) list[tuple]:
+           [
+               ("age", ">", 18),
+               ("name", "ILIKE", "%ali%"),
+               ("status", "=", "active")
+           ]
+        """
+        if where is None:
+            return "", []
+
+        if isinstance(where, tuple) and len(where) == 2:
+            condition, values = where
+            return condition, list(values)
+
+        if isinstance(where, dict):
+            clauses = []
+            params = []
+            index = start_index
+
+            operator_map = {
+                "eq": "=",
+                "ne": "!=",
+                "gt": ">",
+                "gte": ">=",
+                "lt": "<",
+                "lte": "<=",
+                "like": "LIKE",
+                "ilike": "ILIKE",
+            }
+
+            for key, value in where.items():
+                if "__" in key:
+                    field, op = key.rsplit("__", 1)
+                else:
+                    field, op = key, "eq"
+
+                self._validate_identifier(field, "where field")
+
+                if op in operator_map:
+                    clauses.append(f"{field} {operator_map[op]} ${index}")
+                    params.append(value)
+                    index += 1
+
+                elif op == "in":
+                    if not isinstance(value, (list, tuple)) or not value:
+                        raise ValueError(f"{field}__in uchun bo'sh bo'lmagan list/tuple kerak")
+
+                    placeholders = ", ".join(f"${i}" for i in range(index, index + len(value)))
+                    clauses.append(f"{field} IN ({placeholders})")
+                    params.extend(value)
+                    index += len(value)
+
+                elif op == "not_in":
+                    if not isinstance(value, (list, tuple)) or not value:
+                        raise ValueError(f"{field}__not_in uchun bo'sh bo'lmagan list/tuple kerak")
+
+                    placeholders = ", ".join(f"${i}" for i in range(index, index + len(value)))
+                    clauses.append(f"{field} NOT IN ({placeholders})")
+                    params.extend(value)
+                    index += len(value)
+
+                elif op == "isnull":
+                    if value:
+                        clauses.append(f"{field} IS NULL")
+                    else:
+                        clauses.append(f"{field} IS NOT NULL")
+
+                else:
+                    raise ValueError(f"Noma'lum operator: {op}")
+
+            return " AND ".join(clauses), params
+
+        if isinstance(where, list):
+            clauses = []
+            params = []
+            index = start_index
+
+            for item in where:
+                if len(item) != 3:
+                    raise ValueError("List formatidagi where elementlari (field, operator, value) bo'lishi kerak")
+
+                field, operator, value = item
+                self._validate_identifier(field, "where field")
+                op = operator.upper()
+
+                if op in {"=", "!=", ">", ">=", "<", "<=", "LIKE", "ILIKE"}:
+                    clauses.append(f"{field} {op} ${index}")
+                    params.append(value)
+                    index += 1
+
+                elif op in {"IN", "NOT IN"}:
+                    if not isinstance(value, (list, tuple)) or not value:
+                        raise ValueError(f"{field} {op} uchun bo'sh bo'lmagan list/tuple kerak")
+
+                    placeholders = ", ".join(f"${i}" for i in range(index, index + len(value)))
+                    clauses.append(f"{field} {op} ({placeholders})")
+                    params.extend(value)
+                    index += len(value)
+
+                elif op == "IS NULL":
+                    clauses.append(f"{field} IS NULL")
+
+                elif op == "IS NOT NULL":
+                    clauses.append(f"{field} IS NOT NULL")
+
+                else:
+                    raise ValueError(f"Noma'lum operator: {operator}")
+
+            return " AND ".join(clauses), params
+
+        raise TypeError("where tuple, dict yoki list bo'lishi kerak")
+
     async def select(
             self,
             table: str,
-            columns: str = "*",
-            where: Optional[List[Any]] = None,
+            columns: str | list[str] = "*",
+            where: tuple | dict | list | None = None,
             join: Optional[List[tuple]] = None,
             group_by: Optional[str] = None,
             order_by: Optional[str] = None,
@@ -112,8 +272,11 @@ class AsyncPostgresDB:
 
         Args:
             table (str): Asosiy jadval nomi.
-            columns (str): Tanlanadigan ustunlar (default: "*").
-            where (Optional[List[Any]]): ("shart", [qiymatlar])
+            columns (str | list[str]): Tanlanadigan ustunlar.
+            where:
+                tuple — ("age > $1", [18])
+                dict  — {"age__gt": 18, "name__ilike": "%ali%"}
+                list  — [("age", ">", 18), ("name", "ILIKE", "%ali%")]
             join (Optional[List[tuple]]): [("INNER JOIN", "orders", "users.id = orders.user_id")]
             group_by (Optional[str]): GROUP BY ustuni.
             order_by (Optional[str]): ORDER BY qoidasi.
@@ -124,17 +287,22 @@ class AsyncPostgresDB:
         Returns:
             asyncpg.Record yoki list[asyncpg.Record]
         """
+        table = self._validate_identifier(table, "table")
+        columns = self._normalize_columns(columns)
+
         sql = f"SELECT {columns} FROM {table}"
         params: List[Any] = []
 
         if join:
             for join_type, join_table, on_condition in join:
+                join_table = self._validate_identifier(join_table, "join table")
                 sql += f" {join_type} {join_table} ON {on_condition}"
 
         if where:
-            condition, values = where
-            sql += f" WHERE {condition}"
-            params.extend(values)
+            condition, values = self._build_where(where, start_index=1)
+            if condition:
+                sql += f" WHERE {condition}"
+                params.extend(values)
 
         if group_by:
             sql += f" GROUP BY {group_by}"
@@ -143,11 +311,11 @@ class AsyncPostgresDB:
             sql += f" ORDER BY {order_by}"
 
         if limit is not None:
-            sql += f" LIMIT $%d" % (len(params) + 1)
+            sql += f" LIMIT ${len(params) + 1}"
             params.append(limit)
 
         if offset is not None:
-            sql += " OFFSET $%d" % (len(params) + 1)
+            sql += f" OFFSET ${len(params) + 1}"
             params.append(offset)
 
         return await self._manager(sql, *params, fetchone=fetchone, fetchall=not fetchone)

{postgresdb3-0.3.5 → postgresdb3-0.4.0}/postgresdb3/sync_db.py

@@ -204,11 +204,158 @@ class PostgresDB:
             sql += " CASCADE"
         self._manager(sql, commit=True)
 
+    def _build_where(self, where: Any) -> tuple[str, list]:
+        """
+        Qo'llab-quvvatlanadi:
+
+        1) tuple:
+           ("age > %s", [18])
+
+        2) dict:
+           {
+               "age__gt": 18,
+               "name__ilike": "%ali%",
+               "status": "active",
+               "id__in": [1, 2, 3],
+               "deleted_at__isnull": True
+           }
+
+        3) list[tuple]:
+           [
+               ("age", ">", 18),
+               ("name", "ILIKE", "%ali%"),
+               ("status", "=", "active")
+           ]
+        """
+        if where is None:
+            return "", []
+
+        if isinstance(where, tuple) and len(where) == 2:
+            condition, values = where
+            return condition, list(values)
+
+        if isinstance(where, dict):
+            clauses = []
+            params = []
+
+            operator_map = {
+                "eq": "=",
+                "ne": "!=",
+                "gt": ">",
+                "gte": ">=",
+                "lt": "<",
+                "lte": "<=",
+                "like": "LIKE",
+                "ilike": "ILIKE",
+            }
+
+            for key, value in where.items():
+                if "__" in key:
+                    field, op = key.rsplit("__", 1)
+                else:
+                    field, op = key, "eq"
+
+                if op in operator_map:
+                    clauses.append(f"{field} {operator_map[op]} %s")
+                    params.append(value)
+
+                elif op == "in":
+                    if not isinstance(value, (list, tuple)) or not value:
+                        raise ValueError(f"{field}__in uchun bo'sh bo'lmagan list/tuple kerak")
+                    placeholders = ", ".join(["%s"] * len(value))
+                    clauses.append(f"{field} IN ({placeholders})")
+                    params.extend(value)
+
+                elif op == "not_in":
+                    if not isinstance(value, (list, tuple)) or not value:
+                        raise ValueError(f"{field}__not_in uchun bo'sh bo'lmagan list/tuple kerak")
+                    placeholders = ", ".join(["%s"] * len(value))
+                    clauses.append(f"{field} NOT IN ({placeholders})")
+                    params.extend(value)
+
+                elif op == "isnull":
+                    if value:
+                        clauses.append(f"{field} IS NULL")
+                    else:
+                        clauses.append(f"{field} IS NOT NULL")
+
+                else:
+                    raise ValueError(f"Noma'lum operator: {op}")
+
+            return " AND ".join(clauses), params
+
+        if isinstance(where, list):
+            clauses = []
+            params = []
+
+            for item in where:
+                if len(item) != 3:
+                    raise ValueError("List formatidagi where elementlari (field, operator, value) bo'lishi kerak")
+
+                field, operator, value = item
+                op = operator.upper()
+
+                if op in {"=", "!=", ">", ">=", "<", "<=", "LIKE", "ILIKE"}:
+                    clauses.append(f"{field} {op} %s")
+                    params.append(value)
+
+                elif op in {"IN", "NOT IN"}:
+                    if not isinstance(value, (list, tuple)) or not value:
+                        raise ValueError(f"{field} {op} uchun bo'sh bo'lmagan list/tuple kerak")
+                    placeholders = ", ".join(["%s"] * len(value))
+                    clauses.append(f"{field} {op} ({placeholders})")
+                    params.extend(value)
+
+                elif op == "IS NULL":
+                    clauses.append(f"{field} IS NULL")
+
+                elif op == "IS NOT NULL":
+                    clauses.append(f"{field} IS NOT NULL")
+
+                else:
+                    raise ValueError(f"Noma'lum operator: {operator}")
+
+            return " AND ".join(clauses), params
+
+        raise TypeError("where tuple, dict yoki list bo'lishi kerak")
+
+    def _validate_identifier(self, value: str, name: str = "identifier") -> str:
+        """
+        Jadval yoki ustun nomi uchun minimal tekshiruv.
+        Faqat harf, raqam, underscore va nuqtaga ruxsat beradi.
+        """
+        if not isinstance(value, str) or not value.strip():
+            raise ValueError(f"{name} bo'sh bo'lmasligi kerak")
+
+        cleaned = value.replace("_", "").replace(".", "")
+        if not cleaned.isalnum():
+            raise ValueError(f"Invalid {name}: {value}")
+
+        return value
+
+    def _normalize_columns(self, columns: str | list[str]) -> str:
+        """
+        columns list bo'lsa stringga aylantiradi.
+        list bo'lsa har bir column validate qilinadi.
+        str bo'lsa SQL expression bo'lishi mumkinligi uchun o'z holicha qaytariladi.
+        """
+        if isinstance(columns, list):
+            if not columns:
+                raise ValueError("columns bo'sh list bo'lmasligi kerak")
+
+            validated_columns = [self._validate_identifier(col, "column") for col in columns]
+            return ", ".join(validated_columns)
+
+        if not isinstance(columns, str) or not columns.strip():
+            raise ValueError("columns noto'g'ri bo'lishi mumkin emas")
+
+        return columns
+
     def select(
             self,
             table: str,
-            columns: str = "*",
-            where: tuple | None = None,
+            columns: str | list[str] = "*",
+            where: tuple | dict | list | None = None,
             join: list[tuple] | None = None,
             group_by: str | None = None,
             order_by: str | None = None,
@@ -219,8 +366,13 @@ class PostgresDB:
     ) -> Any:
         """
         table: str — asosiy jadval
-        columns: str — tanlanadigan ustunlar ("id, name")
-        where: tuple | None — ("age > %s", [18])
+        columns:
+            str — "id, name"
+            list[str] — ["id", "name"]
+        where:
+            tuple — ("age > %s", [18])
+            dict  — {"age__gt": 18, "name__ilike": "%ali%"}
+            list  — [("age", ">", 18), ("name", "ILIKE", "%ali%")]
         join: list | None — [("INNER JOIN", "orders", "users.id = orders.user_id")]
         group_by: str | None — "age"
         order_by: str | None — "age DESC"
@@ -230,17 +382,22 @@ class PostgresDB:
         fetchmany: int | None
         """
 
+        table = self._validate_identifier(table, "table")
+        columns = self._normalize_columns(columns)
+
         sql = f"SELECT {columns} FROM {table}"
         params = []
 
         if join:
             for join_type, join_table, on_condition in join:
+                join_table = self._validate_identifier(join_table, "join table")
                 sql += f" {join_type} {join_table} ON {on_condition}"
 
         if where:
-            condition, values = where
-            sql += f" WHERE {condition}"
-            params.extend(values)
+            condition, values = self._build_where(where)
+            if condition:
+                sql += f" WHERE {condition}"
+                params.extend(values)
 
         if group_by:
             sql += f" GROUP BY {group_by}"
@@ -249,7 +406,7 @@ class PostgresDB:
             sql += f" ORDER BY {order_by}"
 
         if limit is not None:
-            sql += f" LIMIT %s"
+            sql += " LIMIT %s"
             params.append(limit)
 
         if offset is not None:
@@ -337,7 +494,7 @@ class PostgresDB:
               SELECT table_name
               FROM information_schema.tables
               WHERE table_schema = %s
-              ORDER BY table_name; 
+              ORDER BY table_name; \
               """
         return self._manager(sql, (schema,), fetchall=True)
 
@@ -353,7 +510,7 @@ class PostgresDB:
               FROM information_schema.columns
               WHERE table_schema = %s
                 AND table_name = %s
-              ORDER BY ordinal_position; 
+              ORDER BY ordinal_position; \
               """
         return self._manager(sql, (schema, table), fetchall=True)
 

{postgresdb3-0.3.5 → postgresdb3-0.4.0}/postgresdb3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresdb3
-Version: 0.3.5
+Version: 0.4.0
 Summary: Python uchun oddiy PostgreSQL wrapper
 Author: Abdulbosit Alijonov
 Project-URL: Source Code, https://github.com/AlijonovUz/PostgresDB
@@ -65,18 +65,62 @@ db.insert_many(
 users = db.select("users")
 print(users)
 
+# Faqat kerakli ustunlarni olish
+users = db.select("users", columns=["id", "name"])
+print(users)
+
 # Bitta qatorni olish
-user = db.select("users", where=("name=%s", ["Ali"]), fetchone=True)
+user = db.select("users", where={"name": "Ali"}, fetchone=True)
 print(user)
 
 # Shart bilan ma'lumot olish
-adults = db.select("users", where=("age > %s", [18]))
+adults = db.select("users", where={"age__gt": 18})
 print(adults)
 
 # Bir nechta shart bilan
-specific_users = db.select("users", where=("age > %s AND name = %s", [18, "Ali"]))
+specific_users = db.select(
+    "users",
+    where={
+        "age__gt": 18,
+        "name": "Ali"
+    }
+)
 print(specific_users)
 
+# LIKE bilan qidirish
+users_like = db.select("users", where={"name__like": "%Ali%"})
+print(users_like)
+
+# ILIKE bilan qidirish
+users_ilike = db.select("users", where={"name__ilike": "%ali%"})
+print(users_ilike)
+
+# IN bilan qidirish
+selected_users = db.select("users", where={"id__in": [1, 2, 3]})
+print(selected_users)
+
+# NULL bilan ishlash
+users_with_null = db.select("users", where={"name__isnull": False})
+print(users_with_null)
+
+# Tartiblash va limit
+ordered_users = db.select(
+    "users",
+    where={"age__gt": 18},
+    order_by="age DESC",
+    limit=2
+)
+print(ordered_users)
+
+# Pagination
+paged_users = db.select(
+    "users",
+    order_by="id ASC",
+    limit=2,
+    offset=2
+)
+print(paged_users)
+
 # Faqat 2 ta qatorni olish
 users = db.select("users", fetchmany=2)
 print(users)
@@ -130,18 +174,62 @@ async def main():
     users = await db.select("users")
     print("Barcha foydalanuvchilar:", users)
 
+    # Faqat kerakli ustunlarni olish
+    users = await db.select("users", columns=["id", "name"])
+    print("Faqat id va name:", users)
+
     # Bitta qatorni olish
-    user = await db.select("users", where=("name=$1", ["Ali"]), fetchone=True)
+    user = await db.select("users", where={"name": "Ali"}, fetchone=True)
     print("Foydalanuvchi Ali:", user)
 
     # Shart bilan ma'lumot olish
-    adults = await db.select("users", where=("age > $1", [18]))
+    adults = await db.select("users", where={"age__gt": 18})
     print("Kattalar:", adults)
 
     # Bir nechta shart bilan
-    specific_users = await db.select("users", where=("age > $1 AND name = $2", [18, "Ali"]))
+    specific_users = await db.select(
+        "users",
+        where={
+            "age__gt": 18,
+            "name": "Ali"
+        }
+    )
     print("Maxsus foydalanuvchi:", specific_users)
-    
+
+    # LIKE bilan qidirish
+    users_like = await db.select("users", where={"name__like": "%Ali%"})
+    print("LIKE bo'yicha qidiruv:", users_like)
+
+    # ILIKE bilan qidirish
+    users_ilike = await db.select("users", where={"name__ilike": "%ali%"})
+    print("ILIKE bo'yicha qidiruv:", users_ilike)
+
+    # IN bilan qidirish
+    selected_users = await db.select("users", where={"id__in": [1, 2, 3]})
+    print("Tanlangan foydalanuvchilar:", selected_users)
+
+    # NULL bilan ishlash
+    users_with_not_null_name = await db.select("users", where={"name__isnull": False})
+    print("Name NULL bo'lmaganlar:", users_with_not_null_name)
+
+    # Tartiblash va limit
+    ordered_users = await db.select(
+        "users",
+        where={"age__gt": 18},
+        order_by="age DESC",
+        limit=2
+    )
+    print("Tartiblangan foydalanuvchilar:", ordered_users)
+
+    # Pagination
+    paged_users = await db.select(
+        "users",
+        order_by="id ASC",
+        limit=2,
+        offset=1
+    )
+    print("Pagination natijasi:", paged_users)
+
     # Jadvaldagi ma'lumotni yangilash
     await db.update("users", "age", 26, "name", "Ali")
 

{postgresdb3-0.3.5 → postgresdb3-0.4.0}/setup.py

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