Adapted to changes in ertools

src/Spicey/ControllerGeneration.curry

@@ -4,9 +4,9 @@ module Spicey.ControllerGeneration where
 
 import AbstractCurry.Types
 import AbstractCurry.Build
-import Database.ERD
-import Database.ERDGoodies
 import Char(toLower)
+import Database.ERD
+import Database.ERD.Goodies
 
 import Spicey.GenerationHelper
 

src/Spicey/EntitiesToHtmlGeneration.curry

@@ -3,7 +3,7 @@ module Spicey.EntitiesToHtmlGeneration where
 import AbstractCurry.Types
 import AbstractCurry.Build
 import Database.ERD
-import Database.ERDGoodies
+import Database.ERD.Goodies
 
 import Spicey.GenerationHelper
 

src/Spicey/GenerationHelper.curry

@@ -4,7 +4,7 @@ import AbstractCurry.Types
 import AbstractCurry.Build
 import Char
 import Database.ERD
-import Database.ERDGoodies
+import Database.ERD.Goodies
 import Time
 
 ------------------------------------------------------------------------

src/Spicey/RouteGeneration.curry

@@ -3,7 +3,7 @@ module Spicey.RouteGeneration where
 import AbstractCurry.Types
 import AbstractCurry.Build
 import Database.ERD
-import Database.ERDGoodies
+import Database.ERD.Goodies
 
 import Spicey.ControllerGeneration
 import Spicey.GenerationHelper

src/Spicey/Scaffolding.curry

@@ -8,12 +8,12 @@ import AbstractCurry.Types
 import AbstractCurry.Build
 import AbstractCurry.Pretty hiding(showCProg)
 import Database.ERD
-import Database.ERDGoodies
 import FilePath ( (</>) )
 import IO
 import System(system)
 
 import ERD2Curry ( erd2curryWithDBandERD )
+import Database.ERD.Goodies
 
 import Spicey.ControllerGeneration
 import Spicey.EntitiesToHtmlGeneration

src/Spicey/SpiceUp.curry

@@ -2,13 +2,13 @@
 
 module Spicey.SpiceUp where
 
-import Database.ERD        (ERD, readERDTermFile)
-import Database.ERDGoodies (erdName, storeERDFromProgram)
+import Database.ERD         (ERD, readERDTermFile)
+import Database.ERD.Goodies (erdName, storeERDFromProgram)
 import Directory
 import Distribution
-import FilePath            ((</>))
-import List                (isSuffixOf, last)
-import System              (system, getArgs, exitWith)
+import FilePath             ((</>))
+import List                 (isSuffixOf, last)
+import System               (system, getArgs, exitWith)
 
 import Spicey.PackageConfig (packagePath, packageVersion)
 import Spicey.Scaffolding

src/Spicey/Transformation.curry

@@ -7,7 +7,7 @@
 module Spicey.Transformation(transform) where
 
 import Database.ERD 
-import Database.ERDGoodies
+import Database.ERD.Goodies
 
 ---------------------------------------------------
 -- The main transformation which adds

src/Spicey/ViewGeneration.curry

@@ -3,7 +3,7 @@ module Spicey.ViewGeneration where
 import AbstractCurry.Types
 import AbstractCurry.Build
 import Database.ERD
-import Database.ERDGoodies
+import Database.ERD.Goodies
 
 import Spicey.GenerationHelper