refurb 0.2.1.0 → 0.2.2.0

raw patch · 5 files changed

+7/−10 lines, 5 filesdep −Frames

Dependencies removed: Frames

Files

• refurb.cabal +1/−3
• src/Refurb/Cli.hs +2/−2
• src/Refurb/Run/Info.hs +1/−2
• src/Refurb/Run/Migrate.hs +2/−2
• src/Refurb/Store.hs +1/−1

@@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack  name:           refurb-version:        0.2.1.0+version:        0.2.2.0 synopsis:       Tools for maintaining a database description:    Tools for maintaining a database category:       Database@@ -22,7 +22,6 @@   ghc-options: -Wall -O2   build-depends:       base >= 4.7 && < 5-    , Frames     , ansi-wl-pprint     , bytestring     , classy-prelude@@ -64,7 +63,6 @@   ghc-options: -Wall -O2 -threaded -rtsopts -with-rtsopts=-N -fno-warn-orphans   build-depends:       base >= 4.7 && < 5-    , Frames     , ansi-wl-pprint     , bytestring     , classy-prelude

@@ -2,7 +2,7 @@ module Refurb.Cli where  import ClassyPrelude-import Frames ((:->)(Col))+import Composite.Record ((:->)(Val)) import qualified Options.Applicative as OA import Refurb.Store (FQualifiedKey) @@ -71,7 +71,7 @@   OA.info     (       CommandShowMigration-        <$> (Col . pack <$> OA.strArgument (OA.metavar "MIGRATION-KEY"))+        <$> (Val . pack <$> OA.strArgument (OA.metavar "MIGRATION-KEY"))     )     ( OA.progDesc "Show status of and log details for a particular migration" ) 

@@ -1,14 +1,13 @@ module Refurb.Run.Info where  import ClassyPrelude-import Composite.Base ()+import Composite.Record (Record) import Control.Arrow (returnA) import Control.Lens (Getting, _Wrapped, each, preview, to, view) import Data.Monoid (First) import Data.These (These(This, That, These), there) import Data.Thyme.Clock (NominalDiffTime, fromSeconds) import Data.Thyme.Format.Human (humanTimeDiff)-import Frames (Record) import Opaleye ((.==), constant, restrict) import Refurb.Run.Internal (MonadRefurb, contextDbConn, contextMigrations, optionallyColoredM, migrationResultDoc) import Refurb.Store (FQualifiedKey, MigrationLog, cQualifiedKey, fId, fApplied, fDuration, fOutput, fResult, fQualifiedKey, readMigrationStatus)

@@ -1,6 +1,7 @@ module Refurb.Run.Migrate where  import ClassyPrelude hiding ((</>), defaultTimeLocale, getCurrentTime, formatTime)+import Composite.Record (Record, pattern (:*:), pattern RNil) import Control.Arrow (returnA) import Control.Monad.Logger (askLoggerIO, runLoggingT) import Control.Lens (each, toListOf, view)@@ -13,7 +14,6 @@ import Data.Thyme.Time.Core (fromThyme) import qualified Database.PostgreSQL.Simple as PG import qualified Database.PostgreSQL.Simple.Types as PG-import Frames (Record, (&:), pattern Nil) import Language.Haskell.TH (Loc, loc_package, loc_module, loc_filename, loc_start) import Opaleye (constant, runInsertMany) import Refurb.Cli (GoNoGo(GoNoGo), PreMigrationBackup(PreMigrationBackup), InstallSeedData(InstallSeedData))@@ -92,7 +92,7 @@            void . liftIO $ PG.execute_ dbConn "set search_path = 'public'"           liftIO . runInsertMany dbConn migrationLog . singleton . (constant :: Record MigrationLogW -> Record MigrationLogColsW) $-            Nothing &: migrationQualifiedKey migration &: fromThyme start &: output &: result &: (toSeconds :: NominalDiffTime -> Double) duration &: Nil+            Nothing :*: migrationQualifiedKey migration :*: fromThyme start :*: output :*: result :*: (toSeconds :: NominalDiffTime -> Double) duration :*: RNil      onException       ( do

@@ -4,13 +4,13 @@ import ClassyPrelude import Composite.Opaleye (defaultRecTable) import Composite.Opaleye.TH (deriveOpaleyeEnum)+import Composite.Record ((:->), Record) import Composite.TH (withLensesAndProxies) import Control.Arrow (returnA) import Control.Lens (view) import Control.Monad.Logger (MonadLogger, logDebug) import Data.These (These(This, These, That)) import qualified Database.PostgreSQL.Simple as PG-import Frames ((:->), Record) import Opaleye (Column, PGBool, PGInt4, PGFloat8, PGText, PGTimestamptz, QueryArr, Table(TableWithSchema), asc, orderBy, queryTable, runQuery) import Refurb.MigrationUtils (doesTableExist, qqSqls) import Refurb.Types (Migration, migrationQualifiedKey)