Skip to content

Commit

Permalink
Make sqlWhere{EqualsAny,In,NotIn} prepared-query friendly (#102)
Browse files Browse the repository at this point in the history
  • Loading branch information
arybczak authored Aug 11, 2023
1 parent e7799c6 commit 4fc18b6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# hpqtypes-extras-1.16.4.4 (2023-??-??)
* Switch from `cryptonite` to `crypton`.
* Make `sqlWhereEqualsAny`, `sqlWhereIn` and `sqlWhereNotIn` prepared-query
friendly.

# hpqtypes-extras-1.16.4.3 (2023-06-12)
* Synchronize timezone of a session with timezone of a database after changing
Expand Down
9 changes: 1 addition & 8 deletions src/Database/PostgreSQL/PQTypes/SQL/Builder.hs
Original file line number Diff line number Diff line change
Expand Up @@ -602,14 +602,9 @@ sqlWhereILike name value = sqlWhere $ name <+> "ILIKE" <?> value

-- | Similar to 'sqlWhereIn', but uses @ANY@ instead of @SELECT UNNEST@.
sqlWhereEqualsAny :: (MonadState v m, SqlWhere v, Show a, ToSQL a) => SQL -> [a] -> m ()
sqlWhereEqualsAny name = \case
[] -> sqlWhere "FALSE"
[value] -> sqlWhereEq name value
values -> sqlWhere $ name <+> "= ANY(" <?> Array1 values <+> ")"
sqlWhereEqualsAny name values = sqlWhere $ name <+> "= ANY(" <?> Array1 values <+> ")"

sqlWhereIn :: (MonadState v m, SqlWhere v, Show a, ToSQL a) => SQL -> [a] -> m ()
sqlWhereIn _name [] = sqlWhere "FALSE"
sqlWhereIn name [value] = sqlWhereEq name value
sqlWhereIn name values = do
-- Unpack the array to give query optimizer more options.
sqlWhere $ name <+> "IN (SELECT UNNEST(" <?> Array1 values <+> "))"
Expand All @@ -618,8 +613,6 @@ sqlWhereInSql :: (MonadState v m, Sqlable a, SqlWhere v) => SQL -> a -> m ()
sqlWhereInSql name sql = sqlWhere $ name <+> "IN" <+> parenthesize (toSQLCommand sql)

sqlWhereNotIn :: (MonadState v m, SqlWhere v, Show a, ToSQL a) => SQL -> [a] -> m ()
sqlWhereNotIn _name [] = sqlWhere "TRUE"
sqlWhereNotIn name [value] = sqlWhereNotEq name value
sqlWhereNotIn name values = sqlWhere $ name <+> "NOT IN (SELECT UNNEST(" <?> Array1 values <+> "))"

sqlWhereNotInSql :: (MonadState v m, Sqlable a, SqlWhere v) => SQL -> a -> m ()
Expand Down

0 comments on commit 4fc18b6

Please sign in to comment.