Permalink
Browse files

Merge branch 'postgres' into mongo

Conflicts:
	Model.hs
	PROJECTNAME.cabal
  • Loading branch information...
2 parents 1ec582f + 95e08a7 commit 90c3776e011eadbe88cf8a40f0b8555534457f66 @snoyberg snoyberg committed Dec 11, 2012
Showing with 6 additions and 3 deletions.
  1. +0 −1 Import.hs
  2. +4 −1 Model.hs
  3. +2 −1 PROJECTNAME.cabal
View
@@ -14,7 +14,6 @@ import Model as Import
import Settings as Import
import Settings.Development as Import
import Settings.StaticFiles as Import
-import Data.Aeson as Import (toJSON)
#if __GLASGOW_HASKELL__ >= 704
import Data.Monoid as Import
View
@@ -11,5 +11,8 @@ import Language.Haskell.TH.Syntax
-- You can find more information on persistent and how to declare entities
-- at:
-- http://www.yesodweb.com/book/persistent/
-share [mkPersist MkPersistSettings { mpsBackend = ConT ''MongoBackend }, mkMigrate "migrateAll"]
+let mongoSettings = (mkPersistSettings (ConT ''MongoBackend))
+ { mpsGeneric = False
+ }
+ in share [mkPersist mongoSettings]
$(persistFileWith lowerCaseSettings "config/models")
View
@@ -42,7 +42,7 @@ library
build-depends: base >= 4 && < 5
-- , yesod-platform >= 1.1 && < 1.2
- , yesod >= 1.1.4 && < 1.2
+ , yesod >= 1.1.5 && < 1.2
, yesod-core >= 1.1.5 && < 1.2
, yesod-auth >= 1.1 && < 1.2
, yesod-static >= 1.1 && < 1.2
@@ -53,6 +53,7 @@ library
, text >= 0.11 && < 0.12
, persistent >= 1.1 && < 1.2
, persistent-mongoDB >= 1.1 && < 1.2
+ , persistent-template >= 1.1.1 && < 1.2
, template-haskell
, hamlet >= 1.1 && < 1.2
, shakespeare-css >= 1.0 && < 1.1

0 comments on commit 90c3776

Please sign in to comment.