complete toDoc refactor

Author: fffej

src/Database/SqlServer/Types/Database.hs

@@ -3,11 +3,11 @@
 module Database.SqlServer.Types.Database where
 
 import Database.SqlServer.Types.Identifiers (RegularIdentifier,renderRegularIdentifier)
-import Database.SqlServer.Types.Table (TableDefinition,renderTableDefinition)
+import Database.SqlServer.Types.Table (TableDefinition)
 import Database.SqlServer.Types.Sequence (SequenceDefinition)
 import Database.SqlServer.Types.Procedure
 import Database.SqlServer.Types.Queue
-import Database.SqlServer.Types.Renderable
+import Database.SqlServer.Types.Entity
 
 import Test.QuickCheck
 import Test.QuickCheck.Gen
@@ -25,28 +25,19 @@ data DatabaseDefinition = DatabaseDefinition
                           , queueDefinitions :: [QueueDefinition]
                           }
 
-renderTableDefiniton :: [TableDefinition] -> Doc
-renderTableDefiniton xs = vcat (map renderTableDefinition xs)
-
-renderSequenceDefinitions :: [SequenceDefinition] -> Doc
-renderSequenceDefinitions xs = vcat (map toDoc xs)
-
-renderProcedureDefinitions :: [ProcedureDefinition] -> Doc
-renderProcedureDefinitions xs = vcat (map toDoc xs)
-
-renderQueueDefinitions :: [QueueDefinition] -> Doc
-renderQueueDefinitions xs = vcat (map toDoc xs)
+renderNamedEntities :: Entity a => [a] -> Doc
+renderNamedEntities xs = vcat (map toDoc xs)
 
 renderDatabaseDefinition :: DatabaseDefinition -> Doc
 renderDatabaseDefinition  dd = text "USE master" $+$
                                text "GO" $+$
                                text "CREATE DATABASE" <+> dbName $+$
                                text "GO" $+$
                                text "USE" <+> dbName $+$
-                               renderTableDefiniton (tableDefinitions dd) $+$
-                               renderSequenceDefinitions (sequenceDefinitions dd) $+$
-                               renderProcedureDefinitions (procedureDefinitions dd) $+$
-                               renderQueueDefinitions (queueDefinitions dd)
+                               renderNamedEntities (tableDefinitions dd) $+$
+                               renderNamedEntities (sequenceDefinitions dd) $+$
+                               renderNamedEntities (procedureDefinitions dd) $+$
+                               renderNamedEntities (queueDefinitions dd)
   where
     dbName = renderRegularIdentifier (databaseName dd)
 

src/Database/SqlServer/Types/Entity.hs

@@ -0,0 +1,8 @@
+module Database.SqlServer.Types.Entity where
+
+import Text.PrettyPrint
+
+class Entity a where
+  toDoc :: a -> Doc
+  
+

src/Database/SqlServer/Types/Procedure.hs

@@ -6,7 +6,7 @@ module Database.SqlServer.Types.Procedure where
 
 import Database.SqlServer.Types.Identifiers hiding (unwrap)
 import Database.SqlServer.Types.DataTypes
-import Database.SqlServer.Types.Renderable
+import Database.SqlServer.Types.Entity
 
 import Test.QuickCheck
 import Data.DeriveTH
@@ -47,7 +47,7 @@ derive makeArbitrary ''ProcedureDefinition
 statementBody :: String
 statementBody = "select 1\n"
 
-instance RenderableEntity ProcedureDefinition where
+instance Entity ProcedureDefinition where
   toDoc p = text "CREATE PROCEDURE" <+> renderRegularIdentifier (procedureName p) $+$
                               hcat (punctuate comma (map renderParameter (parameters p))) <+> text "AS" $+$
                               text statementBody $+$

src/Database/SqlServer/Types/Queue.hs

@@ -6,7 +6,7 @@ module Database.SqlServer.Types.Queue where
 
 import Database.SqlServer.Types.Identifiers hiding (unwrap)
 import Database.SqlServer.Types.Procedure
-import Database.SqlServer.Types.Renderable
+import Database.SqlServer.Types.Entity
 
 import Test.QuickCheck
 import Data.DeriveTH
@@ -88,7 +88,7 @@ renderActivation a = text "ACTIVATION(" <+>
                            , renderProcedureName (unwrap $ procedure a)
                            ]) <+> text ")"
 
-instance RenderableEntity QueueDefinition where
+instance Entity QueueDefinition where
   toDoc q = maybe empty renderProc (activation q) $+$
             text "CREATE QUEUE" <+> (renderRegularIdentifier (queueName q)) <+> options $+$ text "GO"
     where

src/Database/SqlServer/Types/Sequence.hs

@@ -7,7 +7,7 @@ module Database.SqlServer.Types.Sequence where
 import Prelude hiding (cycle)
 
 import Database.SqlServer.Types.Identifiers (RegularIdentifier(..), renderRegularIdentifier)
-import Database.SqlServer.Types.Renderable
+import Database.SqlServer.Types.Entity
 
 import Text.PrettyPrint
 import Test.QuickCheck
@@ -55,7 +55,7 @@ renderCacheValue :: Maybe Integer -> Doc
 renderCacheValue Nothing = text "NO CACHE"
 renderCacheValue (Just n) = text "CACHE" <+> integer n
 
-instance RenderableEntity SequenceDefinition where
+instance Entity SequenceDefinition where
   toDoc s = text "CREATE SEQUENCE" <+> renderRegularIdentifier (sequenceName s) $+$
             dataType $+$ startWith' $+$ incrementBy' $+$ minValue' $+$ maxValue' $+$
             cycle' $+$ cache' $+$

src/Database/SqlServer/Types/Table.hs

@@ -19,6 +19,7 @@ import Database.SqlServer.Types.DataTypes (
   )
 
 import Database.SqlServer.Types.Collations (renderCollation)
+import Database.SqlServer.Types.Entity
 
 import Test.QuickCheck
 import Text.PrettyPrint
@@ -74,14 +75,10 @@ renderColumnDefinition c = columnName' <+> columnType' <+> collation' <+>
     nullConstraint    = maybe empty renderNullConstraint (nullOptions (dataType c))
     rowGuidConstraint = renderRowGuidConstraint (rowGuidOptions (dataType c))
 
-renderTableDefinition :: TableDefinition -> Doc
-renderTableDefinition t = text "CREATE TABLE" <+> tableName' $$
-                parens (renderColumnDefinitions (columnDefinitions t)) $+$
-                text "GO"
-  where
-    tableName' = renderRegularIdentifier (tableName t)
-
-
-instance Show TableDefinition where
-  show = render . renderTableDefinition
+instance Entity TableDefinition where
+  toDoc t = text "CREATE TABLE" <+> tableName' $$
+            parens (renderColumnDefinitions (columnDefinitions t)) $+$
+            text "GO"
+    where
+      tableName' = renderRegularIdentifier (tableName t)