feat: add havings to select_custom_fields

Author: NightMarcher

README.md

@@ -55,6 +55,7 @@ await AccountMgr.select_custom_fields(
  ],
  wheres=["id BETWEEN 1 AND 12"],
  groups=["locale", "gender"],
+ havings=["cnt > 0"],
  orders=["locale", "-gender"],
  limit=10,
 )
@@ -66,6 +67,7 @@ Generate sql and execute
  FROM account
  WHERE id BETWEEN 1 AND 12
  GROUP BY locale, gender
+ HAVING cnt > 0
  ORDER BY locale ASC, gender DESC
  LIMIT 10
 ```

examples/service/routers/account.py

@@ -57,6 +57,7 @@ async def query_group_by_locale_view(
  ],
  wheres=["id BETWEEN 1 AND 12"],
  groups=["locale", "gender"],
+ havings=["cnt > 0"],
  orders=["locale", "-gender"],
  limit=10,
  )

fastapi_esql/orm/base_manager.py

@@ -65,6 +65,7 @@ async def select_custom_fields(
  fields: List[str],
  wheres: List[str],
  groups: Optional[List[str]] = None,
+ havings: Optional[List[str]] = None,
  orders: Optional[List[str]] = None,
  limit: int = 0,
  conn: Optional[BaseDBAsyncClient] = None,
@@ -74,6 +75,7 @@ async def select_custom_fields(
  fields,
  wheres,
  groups,
+ havings,
  orders,
  limit,
  )

fastapi_esql/utils/sqlizer.py

@@ -18,6 +18,10 @@ def __init__(self, sql: str):
 
 class SQLizer:
 
+ @classmethod
+ def resolve_condition(cls, conditions: List[str]) -> str:
+ return " AND ".join(conditions)
+
  @classmethod
  def resolve_ordering(cls, orderings: List[str]) -> str:
  orders = []
@@ -57,17 +61,21 @@ def select_custom_fields(
  fields: List[str],
  wheres: List[str],
  groups: Optional[List[str]] = None,
+ havings: Optional[List[str]] = None,
  orders: Optional[List[str]] = None,
  limit: int = 0,
  ) -> Optional[str]:
  if not all([table, fields, wheres]):
  raise WrongParamsError("Please check your params")
+ if havings and not groups:
+ raise WrongParamsError("Please check your params")
 
  group_by = f" GROUP BY {', '.join(groups)}" if groups else ""
+ having = f" HAVING {cls.resolve_condition(havings)}" if havings else ""
  order_by = f" ORDER BY {cls.resolve_ordering(orders)}" if orders else ""
  limit_ = f" LIMIT {limit}" if limit else ""
  # NOTE Doesn't support `offset` parameter due to it's bad performance
- extras = [group_by, order_by, limit_]
+ extras = [group_by, having, order_by, limit_]
 
  sql = """
  SELECT
@@ -77,7 +85,7 @@ def select_custom_fields(
 {}""".format(
  ", ".join(fields),
  table,
- " AND ".join(wheres),
+ cls.resolve_condition(wheres),
  "\n".join(extras) if extras else "",
  )
  logger.debug(sql)
@@ -102,7 +110,7 @@ def upsert_json_field(
  sql = f"""
  UPDATE {table}
  SET {json_field} = JSON_SET(COALESCE({json_field}, '{{}}'), {", ".join(params)})
- WHERE {" AND ".join(wheres)}"""
+ WHERE {cls.resolve_condition(wheres)}"""
  logger.debug(sql)
  return sql
 
@@ -158,7 +166,7 @@ def insert_into_select(
  ({", ".join(fields)})
  SELECT {", ".join(remain_fields + assign_fields)}
  FROM {table}
- WHERE {" AND ".join(wheres)}"""
+ WHERE {cls.resolve_condition(wheres)}"""
  logger.debug(sql)
  return sql