From 33c072d372c3414dc2c24bb4e38104bc829ef93f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 19 Nov 2010 11:39:30 +0200 Subject: [PATCH] persistent 0.3.1.1 in scaffolded site --- scaffold/Model_hs.cg | 6 +++--- scaffold/cabal.cg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scaffold/Model_hs.cg b/scaffold/Model_hs.cg index 4fa4dec6..d97260a5 100644 --- a/scaffold/Model_hs.cg +++ b/scaffold/Model_hs.cg @@ -11,12 +11,12 @@ import Database.Persist.GenericSql (mkMigrate) share2 mkPersist (mkMigrate "migrateAll") [~qq~persist| User ident String - password String null update + password String Maybe Update UniqueUser ident Email email String - user UserId null update - verkey String null update + user UserId Maybe Update + verkey String Maybe Update UniqueEmail email |] diff --git a/scaffold/cabal.cg b/scaffold/cabal.cg index 63e2f5b2..715ca99b 100644 --- a/scaffold/cabal.cg +++ b/scaffold/cabal.cg @@ -28,7 +28,7 @@ executable simple-server , directory , bytestring , text - , persistent + , persistent >= 0.3.1.1 , persistent-~lower~ , template-haskell , hamlet