serviette 0.1.0.1 → 0.1.0.2

raw patch · 2 files changed

+7/−8 lines, 2 filesdep −protoludePVP ok

version bump matches the API change (PVP)

Dependencies removed: protolude

API changes (from Hackage documentation)

Files

• Data/Serviette.hs +6/−6
• serviette.cabal +1/−2

@@ -7,7 +7,7 @@ module Data.Serviette (SqlQuery, SqlResultQuery, rawSqlStr) where  import           Data.ApiDataTypes-import           Data.Text         hiding (concat, map)+import           Data.Text         hiding (concat, foldl, map)   -- | Various Getters@@ -50,7 +50,7 @@  -- | Formats the join table list formatJoinStr :: JoinTable -> Text-formatJoinStr j = Prelude.foldl append "" (" join " : [(extractTableName $ tablename j) , " on " , (extractColumnName $ field j) , " " ,(extractOperator $ operator j) , " " , (extractTableName $ withTable j)  , "." , (extractColumnName $ withField j), " " ])+formatJoinStr j = foldl append "" (" join " : [(extractTableName $ tablename j) , " on " , (extractColumnName $ field j) , " " ,(extractOperator $ operator j) , " " , (extractTableName $ withTable j)  , "." , (extractColumnName $ withField j), " " ])  -- | Fetches field value depending on field type formatFieldValue :: FieldValue -> String@@ -62,7 +62,7 @@  -- | Formats WhereCondition to Text formatWhereConditionStr :: WhereCondition -> Text-formatWhereConditionStr j = Prelude.foldl append " " (" where " : [ (extractTableName $ whereTableName j), "." , (extractColumnName $ whereField j) , " " ,(extractOperator $ whereOperator j) , " " , (pack $ formatFieldValue $ whereFieldValue j)])+formatWhereConditionStr j = foldl append " " (" where " : [ (extractTableName $ whereTableName j), "." , (extractColumnName $ whereField j) , " " ,(extractOperator $ whereOperator j) , " " , (pack $ formatFieldValue $ whereFieldValue j)])   -- | Creates final SqlResultQuery type@@ -71,7 +71,7 @@ -- | Returns raw sql query string rawSqlStr :: SqlQuery -> Text rawSqlStr s =-  Prelude.foldl append "" [(extractAction $ getAction sql) ,(extractTableName $ getSelectTable sql) , joins , whereConditions ]-  where joins = Prelude.foldl append "" $ fmap formatJoinStr $ getJoins sql-        whereConditions = Prelude.foldl append "" $ fmap formatWhereConditionStr $ getWhereCondition sql+  foldl append "" [(extractAction $ getAction sql) ,(extractTableName $ getSelectTable sql) , joins , whereConditions ]+  where joins = foldl append "" $ fmap formatJoinStr $ getJoins sql+        whereConditions = foldl append "" $ fmap formatWhereConditionStr $ getWhereCondition sql         sql = formatToSqlResultQueryType s

@@ -1,5 +1,5 @@ name:                serviette-version:             0.1.0.1+version:             0.1.0.2 synopsis:            JSON to Sql raw string or db result in json format description:         Use json to query the database and receive results homepage:            https://github.com/v0d1ch/serviette#readme@@ -21,7 +21,6 @@                      , bytestring                    >= 0.9        && < 0.11                      , text                          >= 0.11       && < 2.0                      , generic-deriving-                     , protolude