5a3598e · squeal · git.iko.soy

git.iko.soy/squeal

more variable renaming

commit5a3598e8f71b3b3c5648e4798c9a254b8700ea58 authorEitan Chatav <eitan.chatav@gmail.com> dateSat 24 Nov 2018, 15:23 (8 years ago) parent30f62cf

2 files changed+12−12

compare with dev

unifiedsplit

squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+3−3 squeal-postgresql/src/Squeal/PostgreSQL/Transaction.hs+9−9

squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+3−3

@@ -253,9 +253,9 @@ class KnownNat n => HasParameter

253253 parameter ty = UnsafeExpression $ parenthesized $

254254 "$" <> renderNat @n <+> "::"

255255 <+> renderTypeExpression ty

256−instance {-# OVERLAPPING #-} HasParameter 1 schema (ty1:tys) ty1

257−instance {-# OVERLAPPABLE #-} (KnownNat n, HasParameter (n-1) schema params ty)

258− => HasParameter n schema (ty' : params) ty

256+instance {-# OVERLAPPING #-} HasParameter 1 db (ty1:tys) ty1

257+instance {-# OVERLAPPABLE #-} (KnownNat n, HasParameter (n-1) db params ty)

258+ => HasParameter n db (ty' : params) ty

259259

260260-- | `param` takes a `Nat` using type application and for basic types,

261261-- infers a `TypeExpression`.

squeal-postgresql/src/Squeal/PostgreSQL/Transaction.hs+9−9

@@ -52,7 +52,7 @@ import Squeal.PostgreSQL.Schema

5252

5353-- | Run a schema invariant computation `transactionally`.

5454transactionally

55− :: (MonadBaseControl IO tx, MonadPQ schema tx)

55+ :: (MonadBaseControl IO tx, MonadPQ db tx)

5656 => TransactionMode

5757 -> tx x -- ^ run inside a transaction

5858 -> tx x

@@ -64,30 +64,30 @@ transactionally mode tx = mask $ \restore -> do

6464

6565-- | Run a schema invariant computation `transactionally_` in `defaultMode`.

6666transactionally_

67− :: (MonadBaseControl IO tx, MonadPQ schema tx)

67+ :: (MonadBaseControl IO tx, MonadPQ db tx)

6868 => tx x -- ^ run inside a transaction

6969 -> tx x

7070transactionally_ = transactionally defaultMode

7171

7272-- | @BEGIN@ a transaction.

73−begin :: MonadPQ schema tx => TransactionMode -> tx (K Result ('[] :: RowType))

73+begin :: MonadPQ db tx => TransactionMode -> tx (K Result ('[] :: RowType))

7474begin mode = manipulate . UnsafeManipulation $

7575 "BEGIN" <+> renderTransactionMode mode <> ";"

7676

7777-- | @COMMIT@ a schema invariant transaction.

78−commit :: MonadPQ schema tx => tx (K Result ('[] :: RowType))

78+commit :: MonadPQ db tx => tx (K Result ('[] :: RowType))

7979commit = manipulate $ UnsafeManipulation "COMMIT;"

8080

8181-- | @ROLLBACK@ a schema invariant transaction.

82−rollback :: MonadPQ schema tx => tx (K Result ('[] :: RowType))

82+rollback :: MonadPQ db tx => tx (K Result ('[] :: RowType))

8383rollback = manipulate $ UnsafeManipulation "ROLLBACK;"

8484

8585-- | Run a schema changing computation `transactionallySchema`.

8686transactionallySchema

8787 :: MonadBaseControl IO io

8888 => TransactionMode

89− -> PQ schema0 schema1 io x

90− -> PQ schema0 schema1 io x

89+ -> PQ db0 db1 io x

90+ -> PQ db0 db1 io x

9191transactionallySchema mode u = PQ $ \ conn -> mask $ \ restore -> do

9292 _ <- liftBase . LibPQ.exec (unK conn) $

9393 "BEGIN" <+> renderTransactionMode mode <> ";"

@@ -99,8 +99,8 @@ transactionallySchema mode u = PQ $ \ conn -> mask $ \ restore -> do

9999-- | Run a schema changing computation `transactionallySchema_` in `DefaultMode`.

100100transactionallySchema_

101101 :: MonadBaseControl IO io

102− => PQ schema0 schema1 io x

103− -> PQ schema0 schema1 io x

102+ => PQ db0 db1 io x

103+ -> PQ db0 db1 io x

104104transactionallySchema_ = transactionallySchema defaultMode

105105

106106-- | The available transaction characteristics are the transaction `IsolationLevel`,