Skip to content

Commit 3f0877d

Browse files
authored
refactor: remove duplicated code in postgres indexes (#1805)
1 parent ec4e1a1 commit 3f0877d

File tree

2 files changed

+1
-23
lines changed

2 files changed

+1
-23
lines changed

tortoise/contrib/postgres/indexes.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
from typing import Optional, Tuple
2-
3-
from pypika.terms import Term, ValueWrapper
4-
51
from tortoise.indexes import PartialIndex
62

73

@@ -10,22 +6,6 @@ class PostgreSQLIndex(PartialIndex):
106
"CREATE INDEX {exists}{index_name} ON {table_name} USING{index_type}({fields}){extra};"
117
)
128

13-
def __init__(
14-
self,
15-
*expressions: Term,
16-
fields: Optional[Tuple[str, ...]] = None,
17-
name: Optional[str] = None,
18-
condition: Optional[dict] = None,
19-
) -> None:
20-
super().__init__(*expressions, fields=fields, name=name)
21-
if condition:
22-
cond = " WHERE "
23-
items = []
24-
for k, v in condition.items():
25-
items.append(f"{k} = {ValueWrapper(v)}")
26-
cond += " AND ".join(items)
27-
self.extra = cond
28-
299

3010
class BloomIndex(PostgreSQLIndex):
3111
INDEX_TYPE = "BLOOM"

tortoise/indexes.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ def __init__(
7171
super().__init__(*expressions, fields=fields, name=name)
7272
if condition:
7373
cond = " WHERE "
74-
items = []
75-
for k, v in condition.items():
76-
items.append(f"{k} = {ValueWrapper(v)}")
74+
items = [f"{k} = {ValueWrapper(v)}" for k, v in condition.items()]
7775
cond += " AND ".join(items)
7876
self.extra = cond

0 commit comments

Comments
 (0)