Rename TH functions.

2024-12-03 03:52:10 +03:00 · 2013-05-14 19:05:20 +09:00 · 2013-05-14 19:05:20 +09:00 · 7f34dde5cd
commit 7f34dde5cd
parent 64c306ab6b
5 changed files with 56 additions and 56 deletions
--- a/relational-join/src/Database/Relational/Query/TH.hs
+++ b/relational-join/src/Database/Relational/Query/TH.hs
@ -10,9 +10,9 @@ module Database.Relational.Query.TH (

  defineColumn, defineColumnDefault,

-  defineTable, defineTableDefault,
+  defineTableTypes, defineTableTypesDefault,

-  defineRecordAndTableDefault,
+  defineTableTypesAndRecordDefault,

  definePrimaryQuery,
  definePrimaryUpdate,
@ -26,8 +26,8 @@ module Database.Relational.Query.TH (
  defineSqlsWithPrimaryKeyDefault,
  defineSqlsDefault,

-  defineWithTableDefault',
-  defineWithTableDefault,
+  defineTableDefault',
+  defineTableDefault,

  inlineQuery
  ) where
@ -128,13 +128,13 @@ defineColumnDefault mayConstraint recType name =
  where varN        = varCamelcaseName (name ++ "'")
        withCName t = (t, varCamelcaseName (name ++ "_constraint"))

-defineTable :: VarName                          -- ^ Table declaration variable name
-            -> VarName                          -- ^ Relation declaration variable name
-            -> TypeQ                            -- ^ Record type
-            -> String                           -- ^ Table name in SQL ex. FOO_SCHEMA.table0
-            -> [((String, TypeQ), Maybe TypeQ)] -- ^ Column names and types and constraint type
-            -> Q [Dec]                          -- ^ Table and Relation declaration
-defineTable tableVar' relVar' recordType table columns = do
+defineTableTypes :: VarName                          -- ^ Table declaration variable name
+                 -> VarName                          -- ^ Relation declaration variable name
+                 -> TypeQ                            -- ^ Record type
+                 -> String                           -- ^ Table name in SQL ex. FOO_SCHEMA.table0
+                 -> [((String, TypeQ), Maybe TypeQ)] -- ^ Column names and types and constraint type
+                 -> Q [Dec]                          -- ^ Table and Relation declaration
+defineTableTypes tableVar' relVar' recordType table columns = do
  let tableVar = varName tableVar'
  tableDs <- simpleValD tableVar [t| Table $(recordType) |]
            [| Table.table $(stringE table) $(listE $ map stringE (map (fst . fst) columns)) |]
@ -158,13 +158,13 @@ relationVarNameDefault =  varCamelcaseName
 relationVarExpDefault :: String -> ExpQ
 relationVarExpDefault =  toVarExp . relationVarNameDefault

-defineTableDefault :: String                           -- ^ Schema name
-                   -> String                           -- ^ Table name
-                   -> [((String, TypeQ), Maybe TypeQ)] -- ^ Column names and types and constraint type
-                   -> Q [Dec]                          -- ^ Result declarations
-defineTableDefault schema table columns = do
+defineTableTypesDefault :: String                           -- ^ Schema name
+                        -> String                           -- ^ Table name
+                        -> [((String, TypeQ), Maybe TypeQ)] -- ^ Column names and types and constraint type
+                        -> Q [Dec]                          -- ^ Result declarations
+defineTableTypesDefault schema table columns = do
  let recordType = recordTypeDefault table
-  tableDs <- defineTable
+  tableDs <- defineTableTypes
             (tableVarNameDefault table)
             (relationVarNameDefault table)
             recordType
@ -174,15 +174,15 @@ defineTableDefault schema table columns = do
  colsDs  <- fmap concat . sequence . zipWith defCol [0..] $ columns
  return $ tableDs ++ colsDs

-defineRecordAndTableDefault :: TypeQ             -- ^ SQL value type
-                            -> String            -- ^ Schema name
-                            -> String            -- ^ Table name
-                            -> [(String, TypeQ)] -- ^ Column names and types
-                            -> [ConName]         -- ^ Record derivings
-                            -> Q [Dec]           -- ^ Result declarations
-defineRecordAndTableDefault sqlValueType schema table columns drives = do
+defineTableTypesAndRecordDefault :: TypeQ             -- ^ SQL value type
+                                 -> String            -- ^ Schema name
+                                 -> String            -- ^ Table name
+                                 -> [(String, TypeQ)] -- ^ Column names and types
+                                 -> [ConName]         -- ^ Record derivings
+                                 -> Q [Dec]           -- ^ Result declarations
+defineTableTypesAndRecordDefault sqlValueType schema table columns drives = do
  recDs   <- defineRecordDefault sqlValueType table columns drives
-  tableDs <- defineTableDefault schema table [(c, Nothing) | c <- columns ]
+  tableDs <- defineTableTypesDefault schema table [(c, Nothing) | c <- columns ]
  return $ recDs ++ tableDs


@ -241,14 +241,14 @@ defineSqlsDefault table =
    (table `varNameWithPrefix` "insert")


-defineWithTableDefault' :: TypeQ
-                        -> String
-                        -> String
-                        -> [(String, TypeQ)]
-                        -> [ConName]
-                        -> Q [Dec]
-defineWithTableDefault' sqlType schema table fields derives = do
-  recD <- defineRecordAndTableDefault sqlType schema table fields derives
+defineTableDefault' :: TypeQ
+                    -> String
+                    -> String
+                    -> [(String, TypeQ)]
+                    -> [ConName]
+                    -> Q [Dec]
+defineTableDefault' sqlType schema table fields derives = do
+  recD <- defineTableTypesAndRecordDefault sqlType schema table fields derives
  let recType = recordTypeDefault table
      tableE  = tableVarExpDefault table
  sqlD <- defineSqlsDefault table recType tableE
@ -266,17 +266,17 @@ defineWithPrimaryKeyDefault table keyType idx = do
 defineWithNotNullKeyDefault :: String -> TypeQ -> Int -> Q [Dec]
 defineWithNotNullKeyDefault =  defineHasNotNullKeyInstanceDefault

-defineWithTableDefault :: TypeQ
-                       -> String
-                       -> String
-                       -> [(String, TypeQ)]
-                       -> [ConName]
-                       -> Maybe Int
-                       -> Maybe Int
-                       -> Q [Dec]
-defineWithTableDefault sqlType schema table fields derives mayPrimaryIdx mayNotNullIdx = do
+defineTableDefault :: TypeQ
+                   -> String
+                   -> String
+                   -> [(String, TypeQ)]
+                   -> [ConName]
+                   -> Maybe Int
+                   -> Maybe Int
+                   -> Q [Dec]
+defineTableDefault sqlType schema table fields derives mayPrimaryIdx mayNotNullIdx = do
  let keyType = snd . (fields !!)
-  tblD  <- defineWithTableDefault' sqlType schema table fields derives
+  tblD  <- defineTableDefault' sqlType schema table fields derives
  primD <- maybeD (\i -> defineWithPrimaryKeyDefault table (keyType i) i) mayPrimaryIdx
  nnD   <- maybeD (\i -> defineWithNotNullKeyDefault table (keyType i) i) mayNotNullIdx
  return $ tblD ++ primD ++ nnD
--- a/schema-th/src/Database/HDBC/Schema/IBMDB2.hs
+++ b/schema-th/src/Database/HDBC/Schema/IBMDB2.hs
@ -34,7 +34,7 @@ import Database.Record.TH (derivingShow)

 import qualified Database.Relational.Query.Table as Table
 import Database.Relational.Query.Type (unsafeTypedQuery, fromRelation)
-import Database.Relational.Query.TH (defineRecordAndTableDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)
 import Database.Relational.Query
  (Query, PrimeRelation, inner, relation,
   wheres, (.=.), (!), placeholder, asc)
@ -46,7 +46,7 @@ import Database.HDBC.Schema.Driver
  (TypeMap, Driver, getFieldsWithMap, getPrimaryKey, emptyDriver)


-$(defineRecordAndTableDefault
+$(defineTableTypesAndRecordDefault
  [t| SqlValue |]
  "SYSCAT" "columns"
  [
--- a/schema-th/src/Database/HDBC/Schema/PgCatalog/PgAttribute.hs
+++ b/schema-th/src/Database/HDBC/Schema/PgCatalog/PgAttribute.hs
@ -19,9 +19,9 @@ import Database.HDBC.Record.Persistable ()

 import Database.Record.TH (derivingShow)

-import Database.Relational.Query.TH (defineRecordAndTableDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)

-$(defineRecordAndTableDefault
+$(defineTableTypesAndRecordDefault
  [t| SqlValue |]
  "PG_CATALOG" "pg_attribute"

--- a/schema-th/src/Database/HDBC/Schema/PgCatalog/PgType.hs
+++ b/schema-th/src/Database/HDBC/Schema/PgCatalog/PgType.hs
@ -19,9 +19,9 @@ import Database.HDBC.Record.Persistable ()

 import Database.Record.TH (derivingShow)

-import Database.Relational.Query.TH (defineRecordAndTableDefault)
+import Database.Relational.Query.TH (defineTableTypesAndRecordDefault)

-$(defineRecordAndTableDefault
+$(defineTableTypesAndRecordDefault
  [t| SqlValue |]
  "PG_CATALOG" "pg_type"

--- a/schema-th/src/Database/HDBC/TH.hs
+++ b/schema-th/src/Database/HDBC/TH.hs
@ -15,8 +15,8 @@
 -- This module contains templates to generate Haskell record types
 -- and instances correspond to RDB table schema.
 module Database.HDBC.TH (
-  defineWithTableDefault',
-  defineWithTableDefault,
+  defineTableDefault',
+  defineTableDefault,

  defineTableFromDB
  ) where
@ -36,11 +36,11 @@ import Database.HDBC.Record.Persistable ()
 import Database.HDBC.Schema.Driver (Driver, getFields, getPrimaryKey)


-defineWithTableDefault' :: String -> String -> [(String, TypeQ)] -> [ConName] -> Q [Dec]
-defineWithTableDefault' =  Relational.defineWithTableDefault' [t| SqlValue |]
+defineTableDefault' :: String -> String -> [(String, TypeQ)] -> [ConName] -> Q [Dec]
+defineTableDefault' =  Relational.defineTableDefault' [t| SqlValue |]

-defineWithTableDefault  :: String -> String -> [(String, TypeQ)] -> [ConName] -> Maybe Int -> Maybe Int -> Q [Dec]
-defineWithTableDefault  =  Relational.defineWithTableDefault  [t| SqlValue |]
+defineTableDefault  :: String -> String -> [(String, TypeQ)] -> [ConName] -> Maybe Int -> Maybe Int -> Q [Dec]
+defineTableDefault  =  Relational.defineTableDefault  [t| SqlValue |]

 putLog :: String -> IO ()
 putLog =  putStrLn
@ -68,4 +68,4 @@ defineTableFromDB connect drv scm tbl derives = do
            return (cols, notNullIdxs, mayPrimaryIdx) )

  (cols, notNullIdxs, mayPrimaryIdx) <- runIO getDBinfo
-  defineWithTableDefault scm tbl cols derives mayPrimaryIdx (listToMaybe notNullIdxs)
+  defineTableDefault scm tbl cols derives mayPrimaryIdx (listToMaybe notNullIdxs)