modules should be named singular

Author: fffej

sql-server-gen.cabal

@@ -53,10 +53,10 @@ library
   -- Modules exported by the library.
   exposed-modules:     Database.SqlServer.Definitions.Database,
                        Database.SqlServer.Definitions.Sequence,
-                       Database.SqlServer.Definitions.Identifiers,
+                       Database.SqlServer.Definitions.Identifier,
                        Database.SqlServer.Definitions.Procedure,
                        Database.SqlServer.Definitions.Queue,
-                       Database.SqlServer.Definitions.DataTypes,
+                       Database.SqlServer.Definitions.DataType,
                        Database.SqlServer.Definitions.Table,
                        Database.SqlServer.Definitions.Collations,
                        Database.SqlServer.Definitions.Certificate,

src/Database/SqlServer/Definitions/Certificate.hs

@@ -4,7 +4,7 @@ module Database.SqlServer.Definitions.Certificate
        , certificateName
        ) where
 
-import Database.SqlServer.Definitions.Identifiers
+import Database.SqlServer.Definitions.Identifier
 import Database.SqlServer.Definitions.Entity
 
 import Text.PrettyPrint

src/Database/SqlServer/Definitions/Credential.hs

@@ -7,7 +7,7 @@ module Database.SqlServer.Definitions.Credential
          Credential
        ) where
 
-import Database.SqlServer.Definitions.Identifiers hiding (unwrap)
+import Database.SqlServer.Definitions.Identifier hiding (unwrap)
 import Database.SqlServer.Definitions.Entity
 
 import Text.PrettyPrint

…abase/SqlServer/Definitions/DataTypes.hs …tabase/SqlServer/Definitions/DataType.hssrc/Database/SqlServer/Definitions/DataTypes.hs renamed to src/Database/SqlServer/Definitions/DataType.hs src/Database/SqlServer/Definitions/DataTypes.hs renamed to src/Database/SqlServer/Definitions/DataType.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Database.SqlServer.Definitions.DataTypes
+module Database.SqlServer.Definitions.DataType
        (
          Type
        , renderDataType
@@ -19,7 +19,7 @@ module Database.SqlServer.Definitions.DataTypes
        ) where
 
 import Database.SqlServer.Definitions.Collations (Collation)
-import Database.SqlServer.Definitions.Identifiers (ArbUUID)
+import Database.SqlServer.Definitions.Identifier (ArbUUID)
 
 import Text.PrettyPrint
 
@@ -123,9 +123,9 @@ renderNullStorageOptions Null    = text "NULL"
 data UniqueIdentifierOptions = RowGuidCol (Maybe NullStorageOptions)
                              | UniqueIdentifierOptions (Maybe StorageOptions)
 
-uniqueIdentifierstorageOptions :: UniqueIdentifierOptions -> Maybe StorageOptions
-uniqueIdentifierstorageOptions (UniqueIdentifierOptions x) = x
-uniqueIdentifierstorageOptions (RowGuidCol x) = fmap StorageOptions x
+uniqueIdentifiertorageOptions :: UniqueIdentifierOptions -> Maybe StorageOptions
+uniqueIdentifiertorageOptions (UniqueIdentifierOptions x) = x
+uniqueIdentifiertorageOptions (RowGuidCol x) = fmap StorageOptions x
 
 isRowGuidCol :: UniqueIdentifierOptions -> Bool
 isRowGuidCol (RowGuidCol _) = True
@@ -437,7 +437,7 @@ storageOptions (NVarChar _ _ s _) = s
 storageOptions (Binary _ s _)  = s 
 storageOptions (VarBinary _ s _) = s
 storageOptions (HierarchyId s _) = s
-storageOptions (UniqueIdentifier s _) = maybe Nothing uniqueIdentifierstorageOptions s
+storageOptions (UniqueIdentifier s _) = maybe Nothing uniqueIdentifiertorageOptions s
 storageOptions (SqlVariant s _) = s
 storageOptions (Xml s _) = s
 storageOptions (Timestamp _) = Nothing

src/Database/SqlServer/Definitions/Database.hs

@@ -2,7 +2,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 module Database.SqlServer.Definitions.Database where
 
-import Database.SqlServer.Definitions.Identifiers (RegularIdentifier,renderRegularIdentifier)
+import Database.SqlServer.Definitions.Identifier (RegularIdentifier,renderRegularIdentifier)
 import Database.SqlServer.Definitions.Table (Table)
 import Database.SqlServer.Definitions.Sequence (Sequence)
 import Database.SqlServer.Definitions.Procedure (Procedure)

src/Database/SqlServer/Definitions/FullTextCatalog.hs

@@ -6,7 +6,7 @@ module Database.SqlServer.Definitions.FullTextCatalog
          FullTextCatalog
        ) where
 
-import Database.SqlServer.Definitions.Identifiers
+import Database.SqlServer.Definitions.Identifier
 import Database.SqlServer.Definitions.Entity
 
 import Test.QuickCheck

src/Database/SqlServer/Definitions/FullTextStopList.hs

@@ -3,7 +3,7 @@ module Database.SqlServer.Definitions.FullTextStopList
          FullTextStopList
        ) where
 
-import Database.SqlServer.Definitions.Identifiers
+import Database.SqlServer.Definitions.Identifier
 import Database.SqlServer.Definitions.Entity
 
 import Test.QuickCheck

src/Database/SqlServer/Definitions/Function.hs

@@ -7,8 +7,8 @@ module Database.SqlServer.Definitions.Function
          Function
        ) where
 
-import Database.SqlServer.Definitions.Identifiers hiding (unwrap)
-import Database.SqlServer.Definitions.DataTypes
+import Database.SqlServer.Definitions.Identifier hiding (unwrap)
+import Database.SqlServer.Definitions.DataType
 import Database.SqlServer.Definitions.Entity
 
 import Test.QuickCheck

…ase/SqlServer/Definitions/Identifiers.hs …base/SqlServer/Definitions/Identifier.hssrc/Database/SqlServer/Definitions/Identifiers.hs renamed to src/Database/SqlServer/Definitions/Identifier.hs src/Database/SqlServer/Definitions/Identifiers.hs renamed to src/Database/SqlServer/Definitions/Identifier.hs

@@ -2,7 +2,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE GADTs #-}
 
-module Database.SqlServer.Definitions.Identifiers
+module Database.SqlServer.Definitions.Identifier
        (
          RegularIdentifier
        , ArbUUID

src/Database/SqlServer/Definitions/Login.hs

@@ -3,7 +3,7 @@
 
 module Database.SqlServer.Definitions.Login where
 
-import Database.SqlServer.Definitions.Identifiers
+import Database.SqlServer.Definitions.Identifier
 import Database.SqlServer.Definitions.Entity
 
 import Data.DeriveTH