airgql 0.7.1.0 → 0.7.1.1
raw patch · 3 files changed
+22/−24 lines, 3 filesdep ~aesondep ~filepathdep ~graphql
Dependency ranges changed: aeson, filepath, graphql, graphql-spice, simple-sql-parser, unix, unordered-containers
Files
- airgql.cabal +11/−11
- app/Main.hs +11/−1
- source/AirGQL/Utils.hs +0/−12
airgql.cabal view
@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack name: airgql-version: 0.7.1.0+version: 0.7.1.1 synopsis: Automatically generate a GraphQL API for an SQLite database description: AirGQL automatically generates a GraphQL API for SQLite databases. It analyses the database schema@@ -86,7 +86,7 @@ UndecidableInstances ghc-options: -fno-warn-orphans -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missing-deriving-strategies -Wno-missing-kind-signatures -Wno-missing-safe-haskell-mode -Wno-unsafe build-depends:- aeson >=2.2.1 && <2.3+ aeson >=2.1.2.1 && <2.3 , base >=4.18.2 && <4.19 , blaze-markup >=0.8.3 && <0.9 , bytestring >=0.11.5 && <0.12@@ -96,8 +96,7 @@ , exceptions >=0.10.7 && <0.11 , extra >=1.7.14 && <1.8 , filepath >=1.4.200 && <1.5- , githash >=0.1.7 && <0.2- , graphql >=1.3.0 && <1.4+ , graphql >=1.2.0.1 && <1.4 , graphql-spice >=1.0.2 && <1.1 , http-types >=0.12.4 && <0.13 , process >=1.6.17 && <1.7@@ -108,7 +107,7 @@ , servant-docs ==0.13.* , servant-multipart >=0.12.1 && <0.13 , servant-server ==0.20.*- , simple-sql-parser >=0.7.1 && <0.8+ , simple-sql-parser >=0.6.1 && <0.8 , sqlite-simple >=0.4.19 && <0.5 , template-haskell >=2.20.0 && <2.21 , text >=2.0.2 && <2.1@@ -161,6 +160,7 @@ airgql , base >=4.18.2 && <4.19 , cmdargs >=0.10.22 && <0.11+ , githash >=0.1.7 && <0.2 , http-client >=0.7.17 && <0.8 , protolude >=0.3.4 && <0.4 , sqlite-simple >=0.4.19 && <0.5@@ -210,20 +210,20 @@ UndecidableInstances ghc-options: -fno-warn-orphans -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missing-deriving-strategies -Wno-missing-kind-signatures -Wno-missing-safe-haskell-mode -Wno-unsafe build-depends:- aeson >=2.2.1 && <2.3+ aeson >=2.1.2.1 && <2.3 , airgql , base >=4.18.2 && <4.19 , bytestring >=0.11.5 && <0.12 , directory >=1.3.8 && <1.4 , exceptions >=0.10.7 && <0.11- , filepath- , graphql- , graphql-spice+ , filepath >=1.4.200 && <1.5+ , graphql >=1.2.0.1 && <1.4+ , graphql-spice >=1.0.2 && <1.1 , hspec >=2.11.8 && <2.12 , protolude >=0.3.4 && <0.4 , servant-server ==0.20.* , sqlite-simple >=0.4.19 && <0.5 , text >=2.0.2 && <2.1- , unix- , unordered-containers+ , unix >=2.8.4 && <2.9+ , unordered-containers >=0.2.20 && <0.3 default-language: Haskell2010
app/Main.hs view
@@ -1,4 +1,6 @@ {-# LANGUAGE DeriveDataTypeable #-}+-- To look up git hash+{-# LANGUAGE TemplateHaskell #-} -- Necessary for cmdArgs {-# OPTIONS -Wno-partial-fields #-}@@ -28,6 +30,7 @@ import Data.Data (Data) import Data.Text qualified as T import Database.SQLite.Simple qualified as SS+import GitHash (giDirty, giTag, tGitInfoCwd) import Network.HTTP.Client.MultipartFormData () import Network.Wai (Middleware) import Network.Wai.Handler.Warp (@@ -61,7 +64,6 @@ getGraphiQLVersion, getSqliteBinaryVersion, getSqliteEmbeddedVersion,- versionSlug, ) import Server.Server (platformApp) @@ -107,6 +109,14 @@ } in cors (const $ Just policy)+++-- | Imitates output from `git describe --always --dirty`+versionSlug :: Text+versionSlug =+ T.pack $+ giTag $$tGitInfoCwd+ <> (if giDirty $$tGitInfoCwd then "-dirty" else "") main :: IO ()
source/AirGQL/Utils.hs view
@@ -1,7 +1,5 @@ -- For embedded SQL queries {-# LANGUAGE QuasiQuotes #-}--- To look up git hash and to embed package.json-{-# LANGUAGE TemplateHaskell #-} {-# OPTIONS_GHC -Wno-unrecognised-pragmas #-} {-# HLINT ignore "Use maybe" #-}@@ -32,7 +30,6 @@ throwErr400WithMsg, throwErr404WithMsg, throwErr500WithMsg,- versionSlug, withRetryConn, DiffKind (..), ) where@@ -72,7 +69,6 @@ import Data.Text.Encoding qualified as T import Database.SQLite.Simple (Connection) import Database.SQLite.Simple qualified as SS-import GitHash (giDirty, giTag, tGitInfoCwd) import Network.HTTP.Types (HeaderName, encodePathSegments) import Servant.Server ( ServerError (errBody, errHeaders),@@ -119,14 +115,6 @@ getReadOnlyFilePath :: Text -> FilePath getReadOnlyFilePath readonlyId = "data" </> "readonly" </> T.unpack readonlyId----- | Imitates output from `git describe --always --dirty`-versionSlug :: Text-versionSlug =- T.pack $- giTag $$tGitInfoCwd- <> (if giDirty $$tGitInfoCwd then "-dirty" else "") getSqliteEmbeddedVersion :: Connection -> IO Text