From b77a0c3e7185f627807702cec553fd41d4512cf2 Mon Sep 17 00:00:00 2001 From: Fintan Halpenny Date: Sun, 30 Jul 2017 15:04:45 +0100 Subject: [PATCH] Missed some error calls in: *) unsafeSqlBinOpComposite *) sqlSelectProcessRow in the instance of SqlSelect (SqlExpr InsertFinal) InsertFinal --- src/Database/Esqueleto/Internal/Sql.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Database/Esqueleto/Internal/Sql.hs b/src/Database/Esqueleto/Internal/Sql.hs index c8a3c54..7eb3669 100644 --- a/src/Database/Esqueleto/Internal/Sql.hs +++ b/src/Database/Esqueleto/Internal/Sql.hs @@ -82,6 +82,7 @@ data EsqueletoProblem = | UnexpectedCase String -- | Unexpected function case encountered | EmptySqlExprValueList -- | EEmptyList found for value list | UnsupportedSqlInsertIntoType -- | Default Exception for sqlInsertInto + | UnsafeSqlBinOpComposite String -- | Error in unsafeSqlBinOpComposite deriving (Show) instance Exception EsqueletoProblem @@ -674,7 +675,7 @@ unsafeSqlBinOpComposite op sep a b = ERaw Parens $ compose (listify a) (listify vc = v1 <> v2 err' = err . (++ (", " ++ show ((b1, v1), (b2, v2)))) - err = error . ("unsafeSqlBinOpComposite: " ++) + err = throw . UnsafeSqlBinOpComposite . ("unsafeSqlBinOpComposite: " ++) -- | (Internal) A raw SQL value. The same warning from -- 'unsafeSqlBinOp' applies to this function as well. @@ -1201,7 +1202,7 @@ instance SqlSelect (SqlExpr InsertFinal) InsertFinal where in ("INSERT INTO " <> table <> parens fields <> "\n", []) sqlSelectCols info (EInsertFinal (EInsert _ f)) = f info sqlSelectColCount = const 0 - sqlSelectProcessRow = const (Right (error msg)) + sqlSelectProcessRow = const (Right (throw $ UnexpectedCase msg)) where msg = "sqlSelectProcessRow/SqlSelect/InsertionFinal: never here"